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:11:03 +0100 |
| commit | 43f1867e32b502744fcb4b80549f0e6b43878191 (patch) | |
| tree | 50b5de9289fd6f47464752bfa4f2168ac8f04557 /bitbake | |
| parent | c971868360bfe089af2f42956a691b29c755db10 (diff) | |
| download | poky-43f1867e32b502744fcb4b80549f0e6b43878191.tar.gz | |
bitbake: 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.
(Bitbake rev: c630d564285f55f9db10c18269bd310df797430e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
| -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 635b259830..9be5d5e270 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"\${[^{}@]+}") |
| 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): |