data_smart: Fix variable reference issues

The change to use the expansion cache in VariableParse was incorrect as
it was adding in references it shouldn't have been. This patch corrects
the codepaths and ensures the references are correct.

The cache version is bumped since the previous bug could have leave
to invalid checksum calculations and a clean cache is therefore desireable.

The impact of the bug was that sstate was not getting reused when it should
and some tasks were also being rerun when they should not have been.

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

diff --git a/lib/bb/cache.py b/lib/bb/cache.py
index b99fa99cfb0042966f4ea1d6ac05d57900e97e9a..318781ba9b0c9fd08de9c9d4c7751fd29e61c2d1 100644 (file)
--- a/lib/bb/cache.py
+++ b/lib/bb/cache.py
@@ -43,7 +43,7 @@ except ImportError:
     logger.info("Importing cPickle failed. "
                 "Falling back to a very slow implementation.")
 
-__cache_version__ = "146"
+__cache_version__ = "147"
 
 def getCacheFile(path, filename, data_hash):
     return os.path.join(path, filename + "." + data_hash)

diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py
index 79bf3310828328b9abeebe9023adabf105e52cae..71b67e458f36fd25f2f54b34df36509681c3d2d9 100644 (file)
--- a/lib/bb/data_smart.py
+++ b/lib/bb/data_smart.py
@@ -96,10 +96,9 @@ class VariableParse:
                     raise Exception("variable %s references itself!" % self.varname)
             if key in self.d.expand_cache:
                 varparse = self.d.expand_cache[key]
-                self.references |= varparse.references
-                self.execs |= varparse.execs
-                return varparse.value
-            var = self.d.getVar(key, True)
+                var = varparse.value
+            else:
+                var = self.d.getVar(key, True)
             self.references.add(key)
             if var is not None:
                 return var