[oe-commits] [bitbake] 01/02: bb.data_smart: only try to expand refs to valid variable names

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

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

commit df2ac65370aa86cdbc1574fdede25e3519410e45
Author: Christopher Larson <chris_larson at mentor.com>
AuthorDate: Fri Jan 18 21:45:54 2019 +0500

    bb.data_smart: only try to expand refs to valid variable names
    
    This aligns the behavior of expansion with the recipe parser, only
    attempting to expand references to valid variable names. This avoids
    adding references for things like `${foo#${TOPDIR}}` to our vardeps
    without imposing much additional processing overhead beyond the change
    to the expansion regexp.
    
    YOCTO #12987
    
    Signed-off-by: Christopher Larson <chris_larson at mentor.com>
    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 1f45cd9..07db7be 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(r'(?P<base>.*?)(?P<keyword>_append|_prepend|_remove)(_(?P<add>[^A-Z]*))?$')
-__expand_var_regexp__ = re.compile(r"\${[^{}@\n\t :]+}")
+__expand_var_regexp__ = re.compile(r"\${[a-zA-Z0-9\-_+./~]+?}")
 __expand_python_regexp__ = re.compile(r"\${@.+?}")
 __whitespace_split__ = re.compile(r'(\s)')
 __override_regexp__ = re.compile(r'[a-z0-9]+')

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