summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLucian Musat <george.l.musat@intel.com>2015-05-12 18:00:06 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-14 11:44:00 +0100
commit3e7dde7d16ce46c8c4e078c21f8daccb18e4ac0c (patch)
tree4b08b5da5ac41b201279ac8e7b0c45d971798ccc /meta
parent13fb8554b739914bbb8055091212431c470267dd (diff)
downloadpoky-3e7dde7d16ce46c8c4e078c21f8daccb18e4ac0c.tar.gz
oeqa/utils: Fixed a problem with get_bb_var not returning right variable.
It searches using regex now and should be more accurate. (From OE-Core rev: 1ae7e1cc4a5c7a217dee937c330539e5c8ac794d) Signed-off-by: Lucian Musat <george.l.musat@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oeqa/utils/commands.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
index bc1dbb1a5f..663e4e7f41 100644
--- a/meta/lib/oeqa/utils/commands.py
+++ b/meta/lib/oeqa/utils/commands.py
@@ -16,6 +16,7 @@ import threading
16import logging 16import logging
17from oeqa.utils import CommandError 17from oeqa.utils import CommandError
18from oeqa.utils import ftools 18from oeqa.utils import ftools
19import re
19 20
20class Command(object): 21class Command(object):
21 def __init__(self, command, bg=False, timeout=None, data=None, **options): 22 def __init__(self, command, bg=False, timeout=None, data=None, **options):
@@ -139,11 +140,11 @@ def get_bb_var(var, target=None, postconfig=None):
139 bbenv = get_bb_env(target, postconfig=postconfig) 140 bbenv = get_bb_env(target, postconfig=postconfig)
140 lastline = None 141 lastline = None
141 for line in bbenv.splitlines(): 142 for line in bbenv.splitlines():
142 if line.startswith(var + "=") or line.startswith("export " + var + "="): 143 if re.search("^(export )?%s=" % var, line):
143 val = line.split('=')[1] 144 val = line.split('=')[1]
144 val = val.strip('\"') 145 val = val.strip('\"')
145 break 146 break
146 elif line.startswith("unset " + var): 147 elif re.match("unset %s$" % var, line):
147 # Handle [unexport] variables 148 # Handle [unexport] variables
148 if lastline.startswith('# "'): 149 if lastline.startswith('# "'):
149 val = lastline.split('\"')[1] 150 val = lastline.split('\"')[1]