diff options
-rw-r--r-- | bitbake/lib/bb/data_smart.py | 2 | ||||
-rw-r--r-- | bitbake/lib/bb/tests/data.py | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index e4bdb2fdd9..2a1ef90190 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
@@ -610,7 +610,7 @@ class DataSmart(MutableMapping): | |||
610 | else: | 610 | else: |
611 | cachename = var + "[" + flag + "]" | 611 | cachename = var + "[" + flag + "]" |
612 | value = self.expand(value, cachename) | 612 | value = self.expand(value, cachename) |
613 | if value is not None and flag == "_content" and local_var is not None and "_removeactive" in local_var: | 613 | if value and flag == "_content" and local_var is not None and "_removeactive" in local_var: |
614 | filtered = filter(lambda v: v not in local_var["_removeactive"], | 614 | filtered = filter(lambda v: v not in local_var["_removeactive"], |
615 | value.split(" ")) | 615 | value.split(" ")) |
616 | value = " ".join(filtered) | 616 | value = " ".join(filtered) |
diff --git a/bitbake/lib/bb/tests/data.py b/bitbake/lib/bb/tests/data.py index ee66b22e25..228f72c1f5 100644 --- a/bitbake/lib/bb/tests/data.py +++ b/bitbake/lib/bb/tests/data.py | |||
@@ -253,6 +253,11 @@ class TestConcatOverride(unittest.TestCase): | |||
253 | bb.data.update_data(self.d) | 253 | bb.data.update_data(self.d) |
254 | self.assertEqual(self.d.getVar("TEST_TEST", True), "bar bar") | 254 | self.assertEqual(self.d.getVar("TEST_TEST", True), "bar bar") |
255 | 255 | ||
256 | def test_empty_remove(self): | ||
257 | self.d.setVar("TEST", "") | ||
258 | self.d.setVar("TEST_remove", "val") | ||
259 | bb.data.update_data(self.d) | ||
260 | self.assertEqual(self.d.getVar("TEST", True), "") | ||
256 | 261 | ||
257 | class TestOverrides(unittest.TestCase): | 262 | class TestOverrides(unittest.TestCase): |
258 | def setUp(self): | 263 | def setUp(self): |