In expand, drop the unnecessary second regular expression match
(Bitbake rev: 05462fa7908fc22988b3dc9d376798d0a46ccb5a) Signed-off-by: Imran Mehmood <imran_mehmood@mentor.com> Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
parent
e07a5b1909
commit
d00b54b948
|
@ -37,7 +37,6 @@ from bb.COW import COWDictBase
|
|||
__setvar_keyword__ = ["_append", "_prepend"]
|
||||
__setvar_regexp__ = re.compile('(?P<base>.*?)(?P<keyword>_append|_prepend)(_(?P<add>.*))?')
|
||||
__expand_var_regexp__ = re.compile(r"\${[^{}]+}")
|
||||
__expand_python_regexp__ = re.compile(r"\${@.+?}")
|
||||
|
||||
|
||||
class DataSmart:
|
||||
|
@ -51,23 +50,25 @@ class DataSmart:
|
|||
self.expand_cache = {}
|
||||
|
||||
def expand(self, s, varname):
|
||||
def python_sub(code):
|
||||
codeobj = compile(code.strip(), varname or "<expansion>", "eval")
|
||||
value = utils.better_eval(codeobj, {"d": self})
|
||||
return str(value)
|
||||
|
||||
def var_sub(match):
|
||||
key = match.group()[2:-1]
|
||||
if varname and key:
|
||||
if varname == key:
|
||||
raise Exception("variable %s references itself!" % varname)
|
||||
if key[0] == "@":
|
||||
return python_sub(key[1:])
|
||||
|
||||
if varname == key:
|
||||
raise Exception("variable %s references itself!" % varname)
|
||||
|
||||
var = self.getVar(key, 1)
|
||||
if var is not None:
|
||||
return var
|
||||
else:
|
||||
return match.group()
|
||||
|
||||
def python_sub(match):
|
||||
code = match.group()[3:-1]
|
||||
codeobj = compile(code.strip(), varname or "<expansion>", "eval")
|
||||
value = utils.better_eval(codeobj, {"d": self})
|
||||
return str(value)
|
||||
|
||||
if not isinstance(s, basestring): # sanity check
|
||||
return s
|
||||
|
||||
|
@ -78,7 +79,6 @@ class DataSmart:
|
|||
olds = s
|
||||
try:
|
||||
s = __expand_var_regexp__.sub(var_sub, s)
|
||||
s = __expand_python_regexp__.sub(python_sub, s)
|
||||
if s == olds:
|
||||
break
|
||||
except KeyboardInterrupt:
|
||||
|
|
Loading…
Reference in New Issue