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>
This commit is contained in:
Bernhard Reutner-Fischer 2010-11-14 00:36:37 +01:00 committed by Richard Purdie
parent 7e1b709231
commit 1d8a9b8856
1 changed files with 8 additions and 5 deletions

View File

@ -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):