diff options
| -rw-r--r-- | bitbake/lib/bb/data_smart.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 3fb88a93df..6229fbf693 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
| @@ -589,13 +589,9 @@ class DataSmart(MutableMapping): | |||
| 589 | if expand and value: | 589 | if expand and value: |
| 590 | value = self.expand(value, None) | 590 | value = self.expand(value, None) |
| 591 | if value and flag == "_content" and local_var and "_removeactive" in local_var: | 591 | if value and flag == "_content" and local_var and "_removeactive" in local_var: |
| 592 | for i in local_var["_removeactive"]: | 592 | filtered = filter(lambda v: v not in local_var["_removeactive"], |
| 593 | if " " + i + " " in value: | 593 | value.split(" ")) |
| 594 | value = value.replace(" " + i + " ", " ") | 594 | value = " ".join(filtered) |
| 595 | if value.startswith(i + " "): | ||
| 596 | value = value[len(i + " "):] | ||
| 597 | if value.endswith(" " + i): | ||
| 598 | value = value[:-len(" " + i)] | ||
| 599 | return value | 595 | return value |
| 600 | 596 | ||
| 601 | def delVarFlag(self, var, flag, **loginfo): | 597 | def delVarFlag(self, var, flag, **loginfo): |