summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake-dev/lib/bb/cache.py5
-rw-r--r--bitbake/lib/bb/cache.py4
2 files changed, 8 insertions, 1 deletions
diff --git a/bitbake-dev/lib/bb/cache.py b/bitbake-dev/lib/bb/cache.py
index 272619386a..e91967c032 100644
--- a/bitbake-dev/lib/bb/cache.py
+++ b/bitbake-dev/lib/bb/cache.py
@@ -331,6 +331,9 @@ class Cache:
331 if '__BB_DONT_CACHE' in self.depends_cache[fn] and self.depends_cache[fn]['__BB_DONT_CACHE']: 331 if '__BB_DONT_CACHE' in self.depends_cache[fn] and self.depends_cache[fn]['__BB_DONT_CACHE']:
332 bb.msg.debug(2, bb.msg.domain.Cache, "Not caching %s, marked as not cacheable" % fn) 332 bb.msg.debug(2, bb.msg.domain.Cache, "Not caching %s, marked as not cacheable" % fn)
333 del cache_data[fn] 333 del cache_data[fn]
334 elif 'PV' in self.depends_cache[fn] and 'SRCREVINACTION' in self.depends_cache[fn]['PV']:
335 bb.msg.error(bb.msg.domain.Cache, "Not caching %s as it had SRCREVINACTION in PV. Please report this bug" % fn)
336 del cache_data[fn]
334 337
335 p = pickle.Pickler(file(self.cachefile, "wb" ), -1 ) 338 p = pickle.Pickler(file(self.cachefile, "wb" ), -1 )
336 p.dump([cache_data, version_data]) 339 p.dump([cache_data, version_data])
@@ -346,6 +349,8 @@ class Cache:
346 pn = self.getVar('PN', file_name, True) 349 pn = self.getVar('PN', file_name, True)
347 pe = self.getVar('PE', file_name, True) or "0" 350 pe = self.getVar('PE', file_name, True) or "0"
348 pv = self.getVar('PV', file_name, True) 351 pv = self.getVar('PV', file_name, True)
352 if 'SRCREVINACTION' in pv:
353 bb.note("Found SRCREVINACTION in PV (%s) or %s. Please report this bug." % (pv, file_name))
349 pr = self.getVar('PR', file_name, True) 354 pr = self.getVar('PR', file_name, True)
350 dp = int(self.getVar('DEFAULT_PREFERENCE', file_name, True) or "0") 355 dp = int(self.getVar('DEFAULT_PREFERENCE', file_name, True) or "0")
351 depends = bb.utils.explode_deps(self.getVar("DEPENDS", file_name, True) or "") 356 depends = bb.utils.explode_deps(self.getVar("DEPENDS", file_name, True) or "")
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index 989dfc4207..e91967c032 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -332,7 +332,7 @@ class Cache:
332 bb.msg.debug(2, bb.msg.domain.Cache, "Not caching %s, marked as not cacheable" % fn) 332 bb.msg.debug(2, bb.msg.domain.Cache, "Not caching %s, marked as not cacheable" % fn)
333 del cache_data[fn] 333 del cache_data[fn]
334 elif 'PV' in self.depends_cache[fn] and 'SRCREVINACTION' in self.depends_cache[fn]['PV']: 334 elif 'PV' in self.depends_cache[fn] and 'SRCREVINACTION' in self.depends_cache[fn]['PV']:
335 bb.msg.error(bb.msg.domain.Cache, "Not caching %s as it had SRCREVINACTION in PV - need to trace this bug" % fn) 335 bb.msg.error(bb.msg.domain.Cache, "Not caching %s as it had SRCREVINACTION in PV. Please report this bug" % fn)
336 del cache_data[fn] 336 del cache_data[fn]
337 337
338 p = pickle.Pickler(file(self.cachefile, "wb" ), -1 ) 338 p = pickle.Pickler(file(self.cachefile, "wb" ), -1 )
@@ -349,6 +349,8 @@ class Cache:
349 pn = self.getVar('PN', file_name, True) 349 pn = self.getVar('PN', file_name, True)
350 pe = self.getVar('PE', file_name, True) or "0" 350 pe = self.getVar('PE', file_name, True) or "0"
351 pv = self.getVar('PV', file_name, True) 351 pv = self.getVar('PV', file_name, True)
352 if 'SRCREVINACTION' in pv:
353 bb.note("Found SRCREVINACTION in PV (%s) or %s. Please report this bug." % (pv, file_name))
352 pr = self.getVar('PR', file_name, True) 354 pr = self.getVar('PR', file_name, True)
353 dp = int(self.getVar('DEFAULT_PREFERENCE', file_name, True) or "0") 355 dp = int(self.getVar('DEFAULT_PREFERENCE', file_name, True) or "0")
354 depends = bb.utils.explode_deps(self.getVar("DEPENDS", file_name, True) or "") 356 depends = bb.utils.explode_deps(self.getVar("DEPENDS", file_name, True) or "")