sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

wic: create new method _parse_line 

Moved code that parses one line of 'bitbake -e' output
to separate method _parse_line.

This method will be also used later to parse lines of .env files.

(From OE-Core rev: 49ef04d3c9eeb76cbbc89b27b4dd1570b7a2552b)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ed Bartosh 2015-08-30 20:47:01 +03:00 committed by Richard Purdie
parent 58c393022f
commit e1fe3479a6
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
scripts/lib/wic/utils/oe/misc.py
View File

@ -131,6 +131,22 @@ class BitbakeVars(defaultdict):
def __init__(self):
defaultdict.__init__(self, dict)
def _parse_line(self, line, image):
"""
Parse one line from bitbake -e output.
Put result key-value pair into the storage.
"""
if "=" not in line:
return
try:
key, val = line.split("=")
except ValueError:
return
key = key.strip()
val = val.strip()
if key.replace('_', '').isalnum():
self[image][key] = val.strip('"')
def get_var(self, var, image=None):
"""
Get bitbake variable value lazy way, i.e. run
@ -154,16 +170,7 @@ class BitbakeVars(defaultdict):
# Parse bitbake -e output
for line in lines.split('\n'):
if "=" not in line:
continue
try:
key, val = line.split("=")
except ValueError:
continue
key = key.strip()
val = val.strip()
if key.replace('_', '').isalnum():
self[image][key] = val.strip('"')
self._parse_line(line, image)
# Make first image a default set of variables
images = [key for key in self if key]