From: Richard Purdie Date: Mon, 16 Sep 2013 07:21:32 +0000 (+0000) Subject: bitbake: data_smart: Improve variable expansion regexp X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=43f1867e32b502744fcb4b80549f0e6b43878191;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 --- diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py index 635b2598303..9be5d5e270c 100644 --- a/bitbake/lib/bb/data_smart.py +++ b/bitbake/lib/bb/data_smart.py @@ -40,7 +40,7 @@ logger = logging.getLogger("BitBake.Data") __setvar_keyword__ = ["_append", "_prepend", "_remove"] __setvar_regexp__ = re.compile('(?P.*?)(?P_append|_prepend|_remove)(_(?P.*))?$') -__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):