summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-07 07:05:58 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-12 22:50:46 +0100
commit75a58555abf265703dbf2641dc4476610c41ad5a (patch)
tree3090f892c2c278b59b9f8dcb629c1bdf8a7a0bb0
parenta2599686112fca1c2a808fbea24bf10d5f89a74d (diff)
downloadpoky-75a58555abf265703dbf2641dc4476610c41ad5a.tar.gz
bitbake: data_smart: Fix data expansion cache issues
The expand cache can be cleared in the middle of getVar now due to the use of operations like delVar. We therefore need to check if variables are in the cache before accessing in case it was cleared. (Bitbake rev: a97ce216cfe44136f742383542954bfce027831e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/data_smart.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index b9c5d1e5b7..b7ccab767e 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -682,7 +682,7 @@ class DataSmart(MutableMapping):
682 filtered = filter(lambda v: v not in removes, 682 filtered = filter(lambda v: v not in removes,
683 value.split()) 683 value.split())
684 value = " ".join(filtered) 684 value = " ".join(filtered)
685 if expand: 685 if expand and var in self.expand_cache:
686 # We need to ensure the expand cache has the correct value 686 # We need to ensure the expand cache has the correct value
687 # flag == "_content" here 687 # flag == "_content" here
688 self.expand_cache[var].value = value 688 self.expand_cache[var].value = value