diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-20 15:26:32 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-22 12:19:45 +0100 |
| commit | d9955a14fa8758c538caef5045faa96273126776 (patch) | |
| tree | 02c0ec6417328b7c13d6e17bc924f0fa4d5a5d73 | |
| parent | 3c41bea907bb98f9ccc097667506a6e660dd1d1b (diff) | |
| download | poky-d9955a14fa8758c538caef5045faa96273126776.tar.gz | |
bitbake: data_smart: Variable references don't contain newlines, spaces or tabs
The code is happily trying to expand variable names containing newlines,
spaces and tabs which are illegal characters in variable names. This
patch stops it doing this. This will change dependency checksums
since some rather weird dependencies were being attempted to be expanded.
(Bitbake rev: 37e13b852b33d98fa40f49dc1e815b3bbe912ff0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | bitbake/lib/bb/data_smart.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 71b67e458f..b6f5b78cda 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py | |||
| @@ -40,7 +40,7 @@ logger = logging.getLogger("BitBake.Data") | |||
| 40 | 40 | ||
| 41 | __setvar_keyword__ = ["_append", "_prepend", "_remove"] | 41 | __setvar_keyword__ = ["_append", "_prepend", "_remove"] |
| 42 | __setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend|_remove)(_(?P<add>.*))?$') | 42 | __setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend|_remove)(_(?P<add>.*))?$') |
| 43 | __expand_var_regexp__ = re.compile(r"\${[^{}@]+}") | 43 | __expand_var_regexp__ = re.compile(r"\${[^{}@\n\t ]+}") |
| 44 | __expand_python_regexp__ = re.compile(r"\${@.+?}") | 44 | __expand_python_regexp__ = re.compile(r"\${@.+?}") |
| 45 | 45 | ||
| 46 | def infer_caller_details(loginfo, parent = False, varval = True): | 46 | def infer_caller_details(loginfo, parent = False, varval = True): |