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:11:04 +0100
commit385bd4410d01526ad553433de2a24f6517cd6612 (patch)
tree96b61081c749edb7a5bd2c0993c0534157f25793
parenta61519f3fb664c9c0e14babb5e3f97f52ba912cc (diff)
downloadpoky-385bd4410d01526ad553433de2a24f6517cd6612.tar.gz
bitbake: data_smart: Allow flags to use the expand cache
(Bitbake rev: a0122ab80df21597291ff32ff7fbaa4de0347a6f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/data_smart.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index bc4ad54f57..054b5cbebf 100644
--- a/bitbake/lib/bb/data_smart.py
+++ b/bitbake/lib/bb/data_smart.py
@@ -598,6 +598,8 @@ class DataSmart(MutableMapping):
598 cachename = None 598 cachename = None
599 if flag == "_content": 599 if flag == "_content":
600 cachename = var 600 cachename = var
601 else:
602 cachename = var + "[" + flag + "]"
601 value = self.expand(value, cachename) 603 value = self.expand(value, cachename)
602 if value is not None and flag == "_content" and local_var is not None and "_removeactive" in local_var: 604 if value is not None and flag == "_content" and local_var is not None and "_removeactive" in local_var:
603 filtered = filter(lambda v: v not in local_var["_removeactive"], 605 filtered = filter(lambda v: v not in local_var["_removeactive"],
@@ -657,7 +659,7 @@ class DataSmart(MutableMapping):
657 continue 659 continue
658 flags[i] = local_var[i] 660 flags[i] = local_var[i]
659 if expand and i in expand: 661 if expand and i in expand:
660 flags[i] = self.expand(flags[i], None) 662 flags[i] = self.expand(flags[i], var + "[" + i + "]")
661 if len(flags) == 0: 663 if len(flags) == 0:
662 return None 664 return None
663 return flags 665 return flags