diff options
Diffstat (limited to 'bitbake/lib/bb/data_smart.py')
-rw-r--r-- | bitbake/lib/bb/data_smart.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 4434142a02..0a8488ca1b 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
@@ -42,6 +42,7 @@ __setvar_keyword__ = ["_append", "_prepend", "_remove"] | |||
42 | __setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend|_remove)(_(?P<add>[^A-Z]*))?$') | 42 | __setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend|_remove)(_(?P<add>[^A-Z]*))?$') |
43 | __expand_var_regexp__ = re.compile(r"\${[^{}@\n\t :]+}") | 43 | __expand_var_regexp__ = re.compile(r"\${[^{}@\n\t :]+}") |
44 | __expand_python_regexp__ = re.compile(r"\${@.+?}") | 44 | __expand_python_regexp__ = re.compile(r"\${@.+?}") |
45 | __whitespace_split__ = re.compile('(\s)') | ||
45 | 46 | ||
46 | def infer_caller_details(loginfo, parent = False, varval = True): | 47 | def infer_caller_details(loginfo, parent = False, varval = True): |
47 | """Save the caller the trouble of specifying everything.""" | 48 | """Save the caller the trouble of specifying everything.""" |
@@ -818,8 +819,8 @@ class DataSmart(MutableMapping): | |||
818 | 819 | ||
819 | if removes: | 820 | if removes: |
820 | filtered = filter(lambda v: v not in removes, | 821 | filtered = filter(lambda v: v not in removes, |
821 | value.split()) | 822 | __whitespace_split__.split(value)) |
822 | value = " ".join(filtered) | 823 | value = "".join(filtered) |
823 | if expand and var in self.expand_cache: | 824 | if expand and var in self.expand_cache: |
824 | # We need to ensure the expand cache has the correct value | 825 | # We need to ensure the expand cache has the correct value |
825 | # flag == "_content" here | 826 | # flag == "_content" here |