diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-04 15:47:52 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-05 12:36:45 +0100 |
| commit | 136751122a1c7f192f3c2da299fa2622a3010396 (patch) | |
| tree | d3275f8bba8ed99d4e34489a0431ec269661fb97 | |
| parent | bf9a8ec7f2d2a1055c7eafa50d8af01ec1d4dc26 (diff) | |
| download | ast2050-yocto-poky-136751122a1c7f192f3c2da299fa2622a3010396.zip ast2050-yocto-poky-136751122a1c7f192f3c2da299fa2622a3010396.tar.gz | |
bitbake: data_smart: Fix multiple override interaction with append and prepend operators
Variables which used multiple overrides and the append/prepend operators were
not functioning correctly. This change fixes that.
This fixes the testcase:
OVERRIDES = "linux:x86"
TESTVAR = "original"
TESTVAR_append_x86 = " x86"
TESTVAR_append_x86_linux = " x86+linux"
TESTVAR_append_linux_x86 = " linux+x86"
[YOCTO #2672]
(Bitbake rev: dc35a2e506e15fb7ddbf74c3b3280e9e83ab33bb)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | bitbake/lib/bb/data_smart.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 2c02cde..730deaa 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py @@ -198,7 +198,12 @@ class DataSmart(MutableMapping): for append in appends: keep = [] for (a, o) in self.getVarFlag(append, op) or []: - if o and not o in overrides: + match = True + if o: + for o2 in o.split("_"): + if not o2 in overrides: + match = False + if not match: keep.append((a ,o)) continue |
