diff options
| -rw-r--r-- | bitbake/lib/bb/data_smart.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 79d591a237..0cd41683d9 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
| @@ -784,13 +784,14 @@ class DataSmart(MutableMapping): | |||
| 784 | if match: | 784 | if match: |
| 785 | removes.extend(self.expand(r).split()) | 785 | removes.extend(self.expand(r).split()) |
| 786 | 786 | ||
| 787 | filtered = filter(lambda v: v not in removes, | 787 | if removes: |
| 788 | value.split()) | 788 | filtered = filter(lambda v: v not in removes, |
| 789 | value = " ".join(filtered) | 789 | value.split()) |
| 790 | if expand and var in self.expand_cache: | 790 | value = " ".join(filtered) |
| 791 | # We need to ensure the expand cache has the correct value | 791 | if expand and var in self.expand_cache: |
| 792 | # flag == "_content" here | 792 | # We need to ensure the expand cache has the correct value |
| 793 | self.expand_cache[var].value = value | 793 | # flag == "_content" here |
| 794 | self.expand_cache[var].value = value | ||
| 794 | return value | 795 | return value |
| 795 | 796 | ||
| 796 | def delVarFlag(self, var, flag, **loginfo): | 797 | def delVarFlag(self, var, flag, **loginfo): |