From 385bd4410d01526ad553433de2a24f6517cd6612 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Sep 2013 07:45:20 +0000 Subject: bitbake: data_smart: Allow flags to use the expand cache (Bitbake rev: a0122ab80df21597291ff32ff7fbaa4de0347a6f) Signed-off-by: Richard Purdie --- bitbake/lib/bb/data_smart.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'bitbake') 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): 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 -- cgit v1.2.3-54-g00ecf