[oe-commits] [openembedded-core] 51/83: oeqa.utils.commands: use get_bb_vars() in get_bb_var()
git at git.openembedded.org
git at git.openembedded.org
Fri Jul 1 15:32:19 UTC 2016
rpurdie pushed a commit to branch master
in repository openembedded-core.
commit cdd6b7386afd460337705d8117a4328d4993ecef
Author: Markus Lehtonen <markus.lehtonen at linux.intel.com>
AuthorDate: Mon May 2 14:16:30 2016 +0300
oeqa.utils.commands: use get_bb_vars() in get_bb_var()
Get rid of duplicate code.
Signed-off-by: Markus Lehtonen <markus.lehtonen at linux.intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/lib/oeqa/utils/commands.py | 20 +++++---------------
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
index 0297e53..2e513be 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()
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list