From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 21 Jul 2016 16:27:35 +0000 (+0100)
Subject: bitbake: cache: Correctly handle missing extra caches
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=09f6a56aa48f8d73d2900ab7c874258741bc054b;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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 <richard.purdie@linuxfoundation.org>
---

diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index afd373da9b6..b90d488b99b 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: