From 75a58555abf265703dbf2641dc4476610c41ad5a Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 7 Jun 2015 07:05:58 +0000 Subject: 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 --- bitbake/lib/bb/data_smart.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bitbake/lib/bb/data_smart.py') 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): filtered = filter(lambda v: v not in removes, value.split()) value = " ".join(filtered) - if expand: + if expand and var in self.expand_cache: # We need to ensure the expand cache has the correct value # flag == "_content" here self.expand_cache[var].value = value -- cgit v1.2.3-54-g00ecf