diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-08 23:47:58 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-09 23:00:46 +0100 |
| commit | dae4ffb55387edc55fd102c5b6013ab1ebb44a8d (patch) | |
| tree | ec449dca420351119cfe7761cdee3b350293ea98 /bitbake/lib/bb | |
| parent | 7e739acfa781fd29fe030e425ecc32dc8402b896 (diff) | |
| download | poky-dae4ffb55387edc55fd102c5b6013ab1ebb44a8d.tar.gz | |
bitbake: data_smart: Restrict expansion regexp to not include : characters
Bitbake variables don't include ":" characters so exclude these from the variable
expansion regexp.
This assists when parsing shell code which does A=${B:-C} as we don't want a
dependency on a variable called "B:-C".
(Bitbake rev: 14ed41a292123374d94f5c786a619881f2ddea42)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb')
| -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 d61ad5334e..fa1e794279 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"\${[^{}@\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 | 45 | ||
| 46 | def infer_caller_details(loginfo, parent = False, varval = True): | 46 | def infer_caller_details(loginfo, parent = False, varval = True): |