mirror of
https://git.yoctoproject.org/poky
synced 2026-06-02 01:19:52 +00:00
bitbake: data_smart: fix indentation
Fix 8 spaces indentation to be 4 spaces. (Bitbake rev: 973866d134f0493bb3034593fe03cb8bf8920c5c) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -106,52 +106,52 @@ class VariableParse:
|
|||||||
self.contains = {}
|
self.contains = {}
|
||||||
|
|
||||||
def var_sub(self, match):
|
def var_sub(self, match):
|
||||||
key = match.group()[2:-1]
|
key = match.group()[2:-1]
|
||||||
if self.varname and key:
|
if self.varname and key:
|
||||||
if self.varname == key:
|
if self.varname == key:
|
||||||
raise Exception("variable %s references itself!" % self.varname)
|
raise Exception("variable %s references itself!" % self.varname)
|
||||||
var = self.d.getVarFlag(key, "_content")
|
var = self.d.getVarFlag(key, "_content")
|
||||||
self.references.add(key)
|
self.references.add(key)
|
||||||
if var is not None:
|
if var is not None:
|
||||||
return var
|
return var
|
||||||
else:
|
else:
|
||||||
return match.group()
|
return match.group()
|
||||||
|
|
||||||
def python_sub(self, match):
|
def python_sub(self, match):
|
||||||
if isinstance(match, str):
|
if isinstance(match, str):
|
||||||
code = match
|
code = match
|
||||||
else:
|
else:
|
||||||
code = match.group()[3:-1]
|
code = match.group()[3:-1]
|
||||||
|
|
||||||
# Do not run code that contains one or more unexpanded variables
|
# Do not run code that contains one or more unexpanded variables
|
||||||
# instead return the code with the characters we removed put back
|
# instead return the code with the characters we removed put back
|
||||||
if __expand_var_regexp__.findall(code):
|
if __expand_var_regexp__.findall(code):
|
||||||
return "${@" + code + "}"
|
return "${@" + code + "}"
|
||||||
|
|
||||||
if self.varname:
|
if self.varname:
|
||||||
varname = 'Var <%s>' % self.varname
|
varname = 'Var <%s>' % self.varname
|
||||||
else:
|
else:
|
||||||
varname = '<expansion>'
|
varname = '<expansion>'
|
||||||
codeobj = compile(code.strip(), varname, "eval")
|
codeobj = compile(code.strip(), varname, "eval")
|
||||||
|
|
||||||
parser = bb.codeparser.PythonParser(self.varname, logger)
|
parser = bb.codeparser.PythonParser(self.varname, logger)
|
||||||
parser.parse_python(code)
|
parser.parse_python(code)
|
||||||
if self.varname:
|
if self.varname:
|
||||||
vardeps = self.d.getVarFlag(self.varname, "vardeps")
|
vardeps = self.d.getVarFlag(self.varname, "vardeps")
|
||||||
if vardeps is None:
|
if vardeps is None:
|
||||||
parser.log.flush()
|
|
||||||
else:
|
|
||||||
parser.log.flush()
|
parser.log.flush()
|
||||||
self.references |= parser.references
|
else:
|
||||||
self.execs |= parser.execs
|
parser.log.flush()
|
||||||
|
self.references |= parser.references
|
||||||
|
self.execs |= parser.execs
|
||||||
|
|
||||||
for k in parser.contains:
|
for k in parser.contains:
|
||||||
if k not in self.contains:
|
if k not in self.contains:
|
||||||
self.contains[k] = parser.contains[k].copy()
|
self.contains[k] = parser.contains[k].copy()
|
||||||
else:
|
else:
|
||||||
self.contains[k].update(parser.contains[k])
|
self.contains[k].update(parser.contains[k])
|
||||||
value = utils.better_eval(codeobj, DataContext(self.d), {'d' : self.d})
|
value = utils.better_eval(codeobj, DataContext(self.d), {'d' : self.d})
|
||||||
return str(value)
|
return str(value)
|
||||||
|
|
||||||
class DataContext(dict):
|
class DataContext(dict):
|
||||||
excluded = set([i for i in dir(builtins) if not i.startswith('_')] + ['oe'])
|
excluded = set([i for i in dir(builtins) if not i.startswith('_')] + ['oe'])
|
||||||
|
|||||||
Reference in New Issue
Block a user