diff options
| -rw-r--r-- | lib/bb/cache.py | 2 | ||||
| -rw-r--r-- | lib/bb/data_smart.py | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/bb/cache.py b/lib/bb/cache.py index b99fa99cf..318781ba9 100644 --- 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 79bf33108..71b67e458 100644 --- 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 |