From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 22 Jul 2016 10:28:23 +0000 (+0100)
Subject: cache: Add better cache loading sanity checks
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4be4a15491530bd6dc018033ad3d4b2562ab6e23;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

cache: Add better cache loading sanity checks

We've seen cache corruption where the pairs come out in a different
order to the way we saved them for unknown reasons. Add better sanity
checking to give a more user friendly error rather than a crash/traceback.

Also allows the system to reparse and recover.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/lib/bb/cache.py b/lib/bb/cache.py
index cce12d12e9e..439565f5a6e 100644
--- a/lib/bb/cache.py
+++ b/lib/bb/cache.py
@@ -328,6 +328,13 @@ class Cache(object):
                         value = pickled.load()
                     except Exception:
                         break
+                    if not isinstance(key, str):
+                        bb.warn("%s from extras cache is not a string?" % key)
+                        break
+                    if not isinstance(value, RecipeInfoCommon):
+                        bb.warn("%s from extras cache is not a RecipeInfoCommon class?" % value)
+                        break
+
                     if key in self.depends_cache:
                         self.depends_cache[key].append(value)
                     else: