diff options
author | Ross Burton <ross.burton@intel.com> | 2015-02-02 15:09:25 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-02 16:20:42 +0000 |
commit | 207013b6dde82f9654f9be996695c8335b95a288 (patch) | |
tree | 32de36177b2eac3e22bea56e797b1163a5590dd1 /lib/bb/data_smart.py | |
parent | cb2a62a5fbffb358528a85b46c1fc6383286cb9d (diff) | |
download | openembedded-core-contrib-207013b6dde82f9654f9be996695c8335b95a288.tar.gz |
data_smart: split expanded removal values when handling _remove
Given these assignments:
TEST="a b c d"
TEST_remove = "b d"
TEST evaluates to "a c". However, if the _remove override is given as a
variable:
TEST="a b c d"
FOO = "b d"
TEST_remove = "${FOO}
TEST evaluates to "a b c d", because when FOO is expanded it isn't split into a
list.
Solve this by splitting all members of removeactive once they've been expanded.
[ YOCTO #7272 ]
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/data_smart.py')
-rw-r--r-- | lib/bb/data_smart.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py index b1ea33fc30..7bb7b4aae3 100644 --- a/lib/bb/data_smart.py +++ b/lib/bb/data_smart.py @@ -621,7 +621,8 @@ class DataSmart(MutableMapping): cachename = var + "[" + flag + "]" value = self.expand(value, cachename) if value and flag == "_content" and local_var is not None and "_removeactive" in local_var: - removes = [self.expand(r) for r in local_var["_removeactive"]] + removes = [self.expand(r).split() for r in local_var["_removeactive"]] + removes = reduce(lambda a, b: a+b, removes, []) filtered = filter(lambda v: v not in removes, value.split()) value = " ".join(filtered) |