summaryrefslogtreecommitdiff
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2010-11-14 00:36:37 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2011-01-04 14:46:39 +0000
commit1d8a9b88560d27b79f88c37cecc4a7d386182db2 (patch)
treed256a2deeb1f12ef22e672fe993583344fd08eb6 /bitbake/lib/bb
parent7e1b709231803aaa64aeb5e47a3df1ac53c88ef2 (diff)
downloadopenembedded-core-1d8a9b88560d27b79f88c37cecc4a7d386182db2.tar.gz
openembedded-core-1d8a9b88560d27b79f88c37cecc4a7d386182db2.tar.bz2
openembedded-core-1d8a9b88560d27b79f88c37cecc4a7d386182db2.tar.xz
openembedded-core-1d8a9b88560d27b79f88c37cecc4a7d386182db2.zip
bb.cache: only log if the respective action was taken
This avoids alot of misleading log-messages like "Removing FOO from cache" if FOO was not in the cache and as such is not a removal candidate. (Bitbake rev: de34a403e206867e09410ad4925c7b9cff04fee6) Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/cache.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index 9b1003baf..51eb3b82f 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -298,10 +298,12 @@ class Cache:
if invalid:
for cls in (multi or "").split():
virtualfn = self.realfn2virtual(fn, cls)
- logger.debug(2, "Cache: Removing %s from cache", virtualfn)
- del self.clean[virtualfn]
- logger.debug(2, "Cache: removing %s from cache", fn)
- del self.clean[fn]
+ if virtualfn in self.clean:
+ logger.debug(2, "Cache: Removing %s from cache", virtualfn)
+ del self.clean[virtualfn]
+ if fn in self.clean:
+ logger.debug(2, "Cache: Marking %s as not clean", fn)
+ del self.clean[fn]
return False
return True
@@ -311,10 +313,11 @@ class Cache:
Remove a fn from the cache
Called from the parser in error cases
"""
- logger.debug(1, "Removing %s from cache", fn)
if fn in self.depends_cache:
+ logger.debug(1, "Removing %s from cache", fn)
del self.depends_cache[fn]
if fn in self.clean:
+ logger.debug(1, "Marking %s as unclean", fn)
del self.clean[fn]
def sync(self):