[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1495/8267] bitbake: cache: Correctly handle missing extra caches

[Emmanuele Bassi <ebassi src gnome org>]

commit 09f6a56aa48f8d73d2900ab7c874258741bc054b
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Thu Jul 21 17:27:35 2016 +0100

    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>

 bitbake/lib/bb/cache.py |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index afd373d..b90d488 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: