diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-16 07:21:32 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-17 14:09:37 +0100 |
| commit | c630d564285f55f9db10c18269bd310df797430e (patch) | |
| tree | 2c15c914758454ed4f7e6f56a69f89050950df51 | |
| parent | 8ffaba61da7f195d7c3b64dce35b6a56272aecae (diff) | |
| download | bitbake-c630d564285f55f9db10c18269bd310df797430e.tar.gz | |
data_smart: Improve variable expansion regexp
Debugging showed the variable expansion regexp was catching python
expressions (starting with @). Since these are caught by their own
dedicated regexp, stop matching these for the plain variable expansion
for small performance improvements.
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 635b25983..9be5d5e27 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"\${[^{}]+}") +__expand_var_regexp__ = re.compile(r"\${[^{}@]+}") __expand_python_regexp__ = re.compile(r"\${@.+?}") def infer_caller_details(loginfo, parent = False, varval = True): |