From 09f6a56aa48f8d73d2900ab7c874258741bc054b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 21 Jul 2016 17:27:35 +0100 Subject: bitbake: cache: Correctly handle missing extra caches If an "extras" cache file is corrupted, the system would not notice and later fail with errors about missing entries. Add a test for this which means we can fall back to re-parsing in those cases. [YOCTO #9902] (Bitbake rev: 51843d8f2bbe2e54db7593ca61984abe70423ef6) Signed-off-by: Richard Purdie --- bitbake/lib/bb/cache.py | 3 +++ 1 file changed, 3 insertions(+) (limited to 'bitbake/lib/bb/cache.py') diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index afd373da9b..b90d488b99 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py @@ -556,6 +556,9 @@ class Cache(object): if virtualfn not in self.depends_cache: logger.debug(2, "Cache: %s is not cached", virtualfn) invalid = True + elif len(self.depends_cache[virtualfn]) != len(self.caches_array): + logger.debug(2, "Cache: Extra caches missing for %s?" % virtualfn) + invalid = True # If any one of the variants is not present, mark as invalid for all if invalid: -- cgit v1.2.3-54-g00ecf