[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7753/8267] wic: accept '-' in bitbake variables

[Emmanuele Bassi <ebassi src gnome org>]

commit 7324bc16a2cd906c255214d85aff2e555e86ce59
Author: Enrico Scholz <enrico scholz ensc de>
Date:   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.
    
    (From OE-Core rev: e688ac8e92d2bc451d8b2d437596f630bedccd2c)
    
    (From OE-Core rev: 2a69250abf61e51f633033ddb672e8f459191899)
    
    Signed-off-by: Enrico Scholz <enrico scholz ensc de>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/wic/misc.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
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.