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 07:59:43 +0100 |
| commit | 14ed41a292123374d94f5c786a619881f2ddea42 (patch) | |
| tree | 92dd0283c24f1fc2376cd0cfaaeaa67127f7a5e1 | |
| parent | ece3a4d02d8162dee78c2062c10291b5fd625c36 (diff) | |
| download | bitbake-14ed41a292123374d94f5c786a619881f2ddea42.tar.gz | |
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".
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/data_smart.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bb/data_smart.py b/lib/bb/data_smart.py index d61ad5334..fa1e79427 100644 --- a/lib/bb/data_smart.py +++ b/lib/bb/data_smart.py @@ -40,7 +40,7 @@ logger = logging.getLogger("BitBake.Data") __setvar_keyword__ = ["_append", "_prepend", "_remove"] __setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend|_remove)(_(?P<add>.*))?$') -__expand_var_regexp__ = re.compile(r"\${[^{}@\n\t ]+}") +__expand_var_regexp__ = re.compile(r"\${[^{}@\n\t :]+}") __expand_python_regexp__ = re.compile(r"\${@.+?}") def infer_caller_details(loginfo, parent = False, varval = True): |