summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-16 07:45:20 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-17 14:09:38 +0100
commita0122ab80df21597291ff32ff7fbaa4de0347a6f (patch)
tree1251f3a6fa9275cea6df6b91f668d2e3acb77f32
parenta3ae7efdf750fc5bb9ff5a75defbcfdab1912dbe (diff)
downloadbitbake-a0122ab80df21597291ff32ff7fbaa4de0347a6f.tar.gz
data_smart: Allow flags to use the expand cache
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/data_smart.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py
index bc4ad54f5..054b5cbeb 100644
--- a/lib/bb/data_smart.py
+++ b/lib/bb/data_smart.py
@@ -598,6 +598,8 @@ class DataSmart(MutableMapping):
cachename = None
if flag == "_content":
cachename = var
+ else:
+ cachename = var + "[" + flag + "]"
value = self.expand(value, cachename)
if value is not None and flag == "_content" and local_var is not None and "_removeactive" in local_var:
filtered = filter(lambda v: v not in local_var["_removeactive"],
@@ -657,7 +659,7 @@ class DataSmart(MutableMapping):
continue
flags[i] = local_var[i]
if expand and i in expand:
- flags[i] = self.expand(flags[i], None)
+ flags[i] = self.expand(flags[i], var + "[" + i + "]")
if len(flags) == 0:
return None
return flags