[OE-core] [PATCH] oeqa/utils: Fixed a problem with get_bb_var not returning right variable.
Lucian Musat
george.l.musat at intel.com
Tue May 12 15:00:06 UTC 2015
It searches using regex now and should be more accurate.
Signed-off-by: Lucian Musat <george.l.musat at intel.com>
---
meta/lib/oeqa/utils/commands.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
index bc1dbb1..663e4e7 100644
--- a/meta/lib/oeqa/utils/commands.py
+++ b/meta/lib/oeqa/utils/commands.py
@@ -16,6 +16,7 @@ import threading
import logging
from oeqa.utils import CommandError
from oeqa.utils import ftools
+import re
class Command(object):
def __init__(self, command, bg=False, timeout=None, data=None, **options):
@@ -139,11 +140,11 @@ def get_bb_var(var, target=None, postconfig=None):
bbenv = get_bb_env(target, postconfig=postconfig)
lastline = None
for line in bbenv.splitlines():
- if line.startswith(var + "=") or line.startswith("export " + var + "="):
+ if re.search("^(export )?%s=" % var, line):
val = line.split('=')[1]
val = val.strip('\"')
break
- elif line.startswith("unset " + var):
+ elif re.match("unset %s$" % var, line):
# Handle [unexport] variables
if lastline.startswith('# "'):
val = lastline.split('\"')[1]
--
2.1.4
More information about the Openembedded-core
mailing list