[oe-commits] [openembedded-core] 02/17: wic: accept '-' in bitbake variables

[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 openembedded-core.

commit e688ac8e92d2bc451d8b2d437596f630bedccd2c
Author: Enrico Scholz <enrico.scholz at ensc.de>
AuthorDate: Fri Sep 8 19:33:01 2017 +0200

    wic: accept '-' in bitbake variables
    
    '-' is valid and common in bitbake variables (e.g. 'FOO_pn-bar'). Accept
    it and other characters when reading the .env file.
    
    Also, allow variables to be empty.
    
    Signed-off-by: Enrico Scholz <enrico.scholz at ensc.de>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 scripts/lib/wic/misc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py
index 4e07cd6..0792480 100644
--- a/scripts/lib/wic/misc.py
+++ b/scripts/lib/wic/misc.py
@@ -183,7 +183,7 @@ class BitbakeVars(defaultdict):
         self.default_image = None
         self.vars_dir = None
 
-    def _parse_line(self, line, image, matcher=re.compile(r"^(\w+)=(.+)")):
+    def _parse_line(self, line, image, matcher=re.compile(r"^([a-zA-Z0-9\-_+./~]+)=(.*)")):
         """
         Parse one line from bitbake -e output or from .env file.
         Put result key-value pair into the storage.

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