summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-05-02 14:16:30 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-01 16:22:45 +0100
commitcf4c8980d788dd0cc45084bfbd3d7164346054e9 (patch)
tree3e1492f93ec472694714617ae0242d9924524e89
parentc9639e6523ce8b0ce0cfa1ace9bfe8777ab07053 (diff)
downloadopenembedded-core-contrib-cf4c8980d788dd0cc45084bfbd3d7164346054e9.tar.gz
openembedded-core-contrib-cf4c8980d788dd0cc45084bfbd3d7164346054e9.tar.bz2
openembedded-core-contrib-cf4c8980d788dd0cc45084bfbd3d7164346054e9.zip
oeqa.utils.commands: use get_bb_vars() in get_bb_var()
Get rid of duplicate code. (From OE-Core rev: cdd6b7386afd460337705d8117a4328d4993ecef) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/utils/commands.py20
1 files changed, 5 insertions, 15 deletions
diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
index 0297e53dcc..2e513be6af 100644
--- a/meta/lib/oeqa/utils/commands.py
+++ b/meta/lib/oeqa/utils/commands.py
@@ -172,24 +172,14 @@ def get_bb_vars(variables=None, target=None, postconfig=None):
if not variables:
break
lastline = line
+ if variables:
+ # Fill in missing values
+ for var in variables:
+ values[var] = None
return values
def get_bb_var(var, target=None, postconfig=None):
- val = None
- bbenv = get_bb_env(target, postconfig=postconfig)
- lastline = None
- for line in bbenv.splitlines():
- if re.search("^(export )?%s=" % var, line):
- val = line.split('=', 1)[1]
- val = val.strip('\"')
- break
- elif re.match("unset %s$" % var, line):
- # Handle [unexport] variables
- if lastline.startswith('# "'):
- val = lastline.split('\"')[1]
- break
- lastline = line
- return val
+ return get_bb_vars([var], target, postconfig)[var]
def get_test_layer():
layers = get_bb_var("BBLAYERS").split()