[oe-commits] [bitbake] 03/04: data_smart: Restrict expansion regexp to not include : characters

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 14ed41a292123374d94f5c786a619881f2ddea42
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Fri Apr 8 23:47:58 2016 +0100

    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 at linuxfoundation.org>
---
 lib/bb/data_smart.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.