sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: Remove persist_data domain renaming code as it appears to expose sqlite bugs and data consistency issues 

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie 2009-07-30 21:24:31 +01:00
parent ef9c095334
commit 433c2d2318
4 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bitbake-dev/lib/bb/fetch/__init__.py
View File

@ -78,6 +78,7 @@ def uri_replace(uri, uri_find, uri_replace, d):
methods = []
urldata_cache = {}
saved_headrevs = {}
def fetcher_init(d):
"""
@ -91,12 +92,15 @@ def fetcher_init(d):
bb.msg.debug(1, bb.msg.domain.Fetcher, "Keeping SRCREV cache due to cache policy of: %s" % srcrev_policy)
elif srcrev_policy == "clear":
bb.msg.debug(1, bb.msg.domain.Fetcher, "Clearing SRCREV cache due to cache policy of: %s" % srcrev_policy)
pd.renameDomain("BB_URI_HEADREVS", "BB_URI_HEADREVS_PREVIOUS")
try:
bb.fetch.saved_headrevs = pd.getKeyValues("BB_URI_HEADREVS")
except:
pass
pd.delDomain("BB_URI_HEADREVS")
else:
bb.msg.fatal(bb.msg.domain.Fetcher, "Invalid SRCREV cache policy of: %s" % srcrev_policy)
# Make sure our domains exist
pd.addDomain("BB_URI_HEADREVS")
pd.addDomain("BB_URI_HEADREVS_PREVIOUS")
pd.addDomain("BB_URI_LOCALCOUNT")
def fetcher_compare_revisons(d):
@ -107,7 +111,7 @@ def fetcher_compare_revisons(d):
pd = persist_data.PersistData(d)
data = pd.getKeyValues("BB_URI_HEADREVS")
data2 = pd.getKeyValues("BB_URI_HEADREVS_PREVIOUS")
data2 = bb.fetch.saved_headrevs
changed = False
for key in data:

10
bitbake-dev/lib/bb/persist_data.py
View File

@ -69,16 +69,6 @@ class PersistData:
"""
self.connection.execute("DROP TABLE IF EXISTS %s;" % domain)
def renameDomain(self, domain, newdomain):
"""
Renames a domain, removing the target if it already exists
"""
self.connection.execute("DROP TABLE IF EXISTS %s;" % newdomain)
self.addDomain(domain)
self.connection.execute("ALTER TABLE %s RENAME TO %s;" % (domain, newdomain))
def getKeyValues(self, domain):
"""
Return a list of key + value pairs for a domain

10
bitbake/lib/bb/fetch/__init__.py
View File

@ -84,6 +84,7 @@ def uri_replace(uri, uri_find, uri_replace, d):
methods = []
urldata_cache = {}
saved_headrevs = {}
def fetcher_init(d):
"""
@ -97,12 +98,15 @@ def fetcher_init(d):
bb.msg.debug(1, bb.msg.domain.Fetcher, "Keeping SRCREV cache due to cache policy of: %s" % srcrev_policy)
elif srcrev_policy == "clear":
bb.msg.debug(1, bb.msg.domain.Fetcher, "Clearing SRCREV cache due to cache policy of: %s" % srcrev_policy)
pd.renameDomain("BB_URI_HEADREVS", "BB_URI_HEADREVS_PREVIOUS")
try:
bb.fetch.saved_headrevs = pd.getKeyValues("BB_URI_HEADREVS")
except:
pass
pd.delDomain("BB_URI_HEADREVS")
else:
bb.msg.fatal(bb.msg.domain.Fetcher, "Invalid SRCREV cache policy of: %s" % srcrev_policy)
# Make sure our domains exist
pd.addDomain("BB_URI_HEADREVS")
pd.addDomain("BB_URI_HEADREVS_PREVIOUS")
pd.addDomain("BB_URI_LOCALCOUNT")
def fetcher_compare_revisons(d):
@ -113,7 +117,7 @@ def fetcher_compare_revisons(d):
pd = persist_data.PersistData(d)
data = pd.getKeyValues("BB_URI_HEADREVS")
data2 = pd.getKeyValues("BB_URI_HEADREVS_PREVIOUS")
data2 = bb.fetch.saved_headrevs
changed = False
for key in data:

10
bitbake/lib/bb/persist_data.py
View File

@ -69,16 +69,6 @@ class PersistData:
"""
self.connection.execute("DROP TABLE IF EXISTS %s;" % domain)
def renameDomain(self, domain, newdomain):
"""
Renames a domain, removing the target if it already exists
"""
self.connection.execute("DROP TABLE IF EXISTS %s;" % newdomain)
self.addDomain(domain)
self.connection.execute("ALTER TABLE %s RENAME TO %s;" % (domain, newdomain))
def getKeyValues(self, domain):
"""
Return a list of key + value pairs for a domain