[PATCH] data_smart: Restrict expansion regexp to not include : characters

[PATCH] data_smart: Restrict expansion regexp to not include : characters

[Richard Purdie]

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>

diff --git a/bitbake/lib/bb/data_smart.py b/bitbake/lib/bb/data_smart.py
index d61ad53..fa1e794 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<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):

Re: [PATCH] data_smart: Restrict expansion regexp to not include : characters

[Christopher Larson]

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

On Fri, Apr 8, 2016 at 3:48 PM Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> 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>
>

Nice, this one's been bugging me on and off for a while :) Looks good.

[-- Attachment #2: Type: text/html, Size: 870 bytes --]