From f0ec387ad40fb9c098ac8d761993bc2bacc76e65 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 21 Dec 2016 17:05:11 +0200 Subject: wic: fix parsing of 'bitbake -e' output Current parsing code can wrongly interpret arbitrary lines that are of 'key=value' format as legitimate bitbake variables. Implemented more strict parsing of key=value pairs using regular expressions. Signed-off-by: Ed Bartosh Signed-off-by: Ross Burton --- scripts/lib/wic/utils/oe/misc.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/wic/utils/oe/misc.py b/scripts/lib/wic/utils/oe/misc.py index fe188c9d26..2a2fcc94fb 100644 --- a/scripts/lib/wic/utils/oe/misc.py +++ b/scripts/lib/wic/utils/oe/misc.py @@ -27,6 +27,7 @@ """Miscellaneous functions.""" import os +import re from collections import defaultdict from distutils import spawn @@ -148,21 +149,18 @@ class BitbakeVars(defaultdict): self.default_image = None self.vars_dir = None - def _parse_line(self, line, image): + def _parse_line(self, line, image, matcher=re.compile(r"^(\w+)=(.+)")): """ Parse one line from bitbake -e output or from .env file. Put result key-value pair into the storage. """ if "=" not in line: return - try: - key, val = line.split("=") - except ValueError: + match = matcher.match(line) + if not match: return - key = key.strip() - val = val.strip() - if key.replace('_', '').isalnum(): - self[image][key] = val.strip('"') + key, val = match.groups() + self[image][key] = val.strip('"') def get_var(self, var, image=None): """ -- cgit 1.2.3-korg