summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/cache.py2
-rw-r--r--bitbake/lib/bb/data_smart.py7
2 files changed, 4 insertions, 5 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index b99fa99cfb..318781ba9b 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -43,7 +43,7 @@ except ImportError:
43 logger.info("Importing cPickle failed. " 43 logger.info("Importing cPickle failed. "
44 "Falling back to a very slow implementation.") 44 "Falling back to a very slow implementation.")
45 45
46__cache_version__ = "146" 46__cache_version__ = "147"
47 47
48def getCacheFile(path, filename, data_hash): 48def getCacheFile(path, filename, data_hash):
49 return os.path.join(path, filename + "." + data_hash) 49 return os.path.join(path, filename + "." + data_hash)
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index 79bf331082..71b67e458f 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -96,10 +96,9 @@ class VariableParse:
96 raise Exception("variable %s references itself!" % self.varname) 96 raise Exception("variable %s references itself!" % self.varname)
97 if key in self.d.expand_cache: 97 if key in self.d.expand_cache:
98 varparse = self.d.expand_cache[key] 98 varparse = self.d.expand_cache[key]
99 self.references |= varparse.references 99 var = varparse.value
100 self.execs |= varparse.execs 100 else:
101 return varparse.value 101 var = self.d.getVar(key, True)
102 var = self.d.getVar(key, True)
103 self.references.add(key) 102 self.references.add(key)
104 if var is not None: 103 if var is not None:
105 return var 104 return var