diff options
Diffstat (limited to 'bitbake/lib/bb/cache.py')
-rw-r--r-- | bitbake/lib/bb/cache.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 5b8e3ee8f4..a0df93eb41 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py | |||
@@ -43,7 +43,7 @@ except ImportError: | |||
43 | logger.info("Importing cPickle failed. " | 43 | logger.info("Importing cPickle failed. " |
44 | "Falling back to a very slow implementation.") | 44 | "Falling back to a very slow implementation.") |
45 | 45 | ||
46 | __cache_version__ = "139" | 46 | __cache_version__ = "140" |
47 | 47 | ||
48 | def getCacheFile(path, filename): | 48 | def getCacheFile(path, filename): |
49 | return os.path.join(path, filename) | 49 | return os.path.join(path, filename) |
@@ -96,8 +96,11 @@ class CoreRecipeInfo(RecipeInfoCommon): | |||
96 | self.variants = self.listvar('__VARIANTS', metadata) + [''] | 96 | self.variants = self.listvar('__VARIANTS', metadata) + [''] |
97 | self.nocache = self.getvar('__BB_DONT_CACHE', metadata) | 97 | self.nocache = self.getvar('__BB_DONT_CACHE', metadata) |
98 | 98 | ||
99 | if self.getvar('__SKIPPED', metadata): | 99 | self.skipreason = self.getvar('__SKIPPED', metadata) |
100 | if self.skipreason: | ||
100 | self.skipped = True | 101 | self.skipped = True |
102 | self.provides = self.depvar('PROVIDES', metadata) | ||
103 | self.rprovides = self.depvar('RPROVIDES', metadata) | ||
101 | return | 104 | return |
102 | 105 | ||
103 | self.tasks = metadata.getVar('__BBTASKS', False) | 106 | self.tasks = metadata.getVar('__BBTASKS', False) |
@@ -446,7 +449,7 @@ class Cache(object): | |||
446 | cached, infos = self.load(fn, appends, cfgData) | 449 | cached, infos = self.load(fn, appends, cfgData) |
447 | for virtualfn, info_array in infos: | 450 | for virtualfn, info_array in infos: |
448 | if info_array[0].skipped: | 451 | if info_array[0].skipped: |
449 | logger.debug(1, "Skipping %s", virtualfn) | 452 | logger.debug(1, "Skipping %s: %s", virtualfn, info_array[0].skipreason) |
450 | skipped += 1 | 453 | skipped += 1 |
451 | else: | 454 | else: |
452 | self.add_info(virtualfn, info_array, cacheData, not cached) | 455 | self.add_info(virtualfn, info_array, cacheData, not cached) |