bitbake: bitbake: remove True option to getVarFlag calls
getVarFlag() now defaults to expanding by default, thus remove the True option from getVarFlag() calls with a regex search and replace. Search made with the following regex: getVarFlag ?\(( ?[^,()]*, ?[^,()]*), True\) (Bitbake rev: c19baa8c19ea8ab9b9b64fd30298d8764c6fd2cd) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
1fce7ecbbb
commit
ddaac5e4e3
|
@ -243,7 +243,7 @@ def fork_off_task(cfg, data, databuilder, workerdata, fn, task, taskname, append
|
||||||
the_data.setVar(e, fakeenv[e])
|
the_data.setVar(e, fakeenv[e])
|
||||||
the_data.setVarFlag(e, 'export', "1")
|
the_data.setVarFlag(e, 'export', "1")
|
||||||
|
|
||||||
task_exports = the_data.getVarFlag(taskname, 'exports', True)
|
task_exports = the_data.getVarFlag(taskname, 'exports')
|
||||||
if task_exports:
|
if task_exports:
|
||||||
for e in task_exports.split():
|
for e in task_exports.split():
|
||||||
the_data.setVarFlag(e, 'export', '1')
|
the_data.setVarFlag(e, 'export', '1')
|
||||||
|
|
|
@ -377,7 +377,7 @@ exit $ret
|
||||||
else:
|
else:
|
||||||
logfile = sys.stdout
|
logfile = sys.stdout
|
||||||
|
|
||||||
progress = d.getVarFlag(func, 'progress', True)
|
progress = d.getVarFlag(func, 'progress')
|
||||||
if progress:
|
if progress:
|
||||||
if progress == 'percent':
|
if progress == 'percent':
|
||||||
# Use default regex
|
# Use default regex
|
||||||
|
@ -669,7 +669,7 @@ def stamp_internal(taskname, d, file_name, baseonly=False, noextra=False):
|
||||||
else:
|
else:
|
||||||
stamp = d.getVar('STAMP')
|
stamp = d.getVar('STAMP')
|
||||||
file_name = d.getVar('BB_FILENAME')
|
file_name = d.getVar('BB_FILENAME')
|
||||||
extrainfo = d.getVarFlag(taskflagname, 'stamp-extra-info', True) or ""
|
extrainfo = d.getVarFlag(taskflagname, 'stamp-extra-info') or ""
|
||||||
|
|
||||||
if baseonly:
|
if baseonly:
|
||||||
return stamp
|
return stamp
|
||||||
|
@ -705,7 +705,7 @@ def stamp_cleanmask_internal(taskname, d, file_name):
|
||||||
else:
|
else:
|
||||||
stamp = d.getVar('STAMPCLEAN')
|
stamp = d.getVar('STAMPCLEAN')
|
||||||
file_name = d.getVar('BB_FILENAME')
|
file_name = d.getVar('BB_FILENAME')
|
||||||
extrainfo = d.getVarFlag(taskflagname, 'stamp-extra-info', True) or ""
|
extrainfo = d.getVarFlag(taskflagname, 'stamp-extra-info') or ""
|
||||||
|
|
||||||
if not stamp:
|
if not stamp:
|
||||||
return []
|
return []
|
||||||
|
|
|
@ -71,7 +71,7 @@ class RecipeInfoCommon(object):
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def flaglist(cls, flag, varlist, metadata, squash=False):
|
def flaglist(cls, flag, varlist, metadata, squash=False):
|
||||||
out_dict = dict((var, metadata.getVarFlag(var, flag, True))
|
out_dict = dict((var, metadata.getVarFlag(var, flag))
|
||||||
for var in varlist)
|
for var in varlist)
|
||||||
if squash:
|
if squash:
|
||||||
return dict((k,v) for (k,v) in out_dict.items() if v)
|
return dict((k,v) for (k,v) in out_dict.items() if v)
|
||||||
|
|
|
@ -369,7 +369,7 @@ class CookerDataBuilder(object):
|
||||||
parselog.critical("Undefined event handler function '%s'" % var)
|
parselog.critical("Undefined event handler function '%s'" % var)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
handlerln = int(data.getVarFlag(var, "lineno", False))
|
handlerln = int(data.getVarFlag(var, "lineno", False))
|
||||||
bb.event.register(var, data.getVar(var, False), (data.getVarFlag(var, "eventmask", True) or "").split(), handlerfn, handlerln)
|
bb.event.register(var, data.getVar(var, False), (data.getVarFlag(var, "eventmask") or "").split(), handlerfn, handlerln)
|
||||||
|
|
||||||
data.setVar('BBINCLUDED',bb.parse.get_file_depends(data))
|
data.setVar('BBINCLUDED',bb.parse.get_file_depends(data))
|
||||||
|
|
||||||
|
|
|
@ -226,7 +226,7 @@ def emit_func(func, o=sys.__stdout__, d = init()):
|
||||||
o.write('\n')
|
o.write('\n')
|
||||||
emit_var(func, o, d, False) and o.write('\n')
|
emit_var(func, o, d, False) and o.write('\n')
|
||||||
newdeps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func))
|
newdeps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func))
|
||||||
newdeps |= set((d.getVarFlag(func, "vardeps", True) or "").split())
|
newdeps |= set((d.getVarFlag(func, "vardeps") or "").split())
|
||||||
seen = set()
|
seen = set()
|
||||||
while newdeps:
|
while newdeps:
|
||||||
deps = newdeps
|
deps = newdeps
|
||||||
|
@ -236,7 +236,7 @@ def emit_func(func, o=sys.__stdout__, d = init()):
|
||||||
if d.getVarFlag(dep, "func", False) and not d.getVarFlag(dep, "python", False):
|
if d.getVarFlag(dep, "func", False) and not d.getVarFlag(dep, "python", False):
|
||||||
emit_var(dep, o, d, False) and o.write('\n')
|
emit_var(dep, o, d, False) and o.write('\n')
|
||||||
newdeps |= bb.codeparser.ShellParser(dep, logger).parse_shell(d.getVar(dep))
|
newdeps |= bb.codeparser.ShellParser(dep, logger).parse_shell(d.getVar(dep))
|
||||||
newdeps |= set((d.getVarFlag(dep, "vardeps", True) or "").split())
|
newdeps |= set((d.getVarFlag(dep, "vardeps") or "").split())
|
||||||
newdeps -= seen
|
newdeps -= seen
|
||||||
|
|
||||||
_functionfmt = """
|
_functionfmt = """
|
||||||
|
@ -259,7 +259,7 @@ def emit_func_python(func, o=sys.__stdout__, d = init()):
|
||||||
pp = bb.codeparser.PythonParser(func, logger)
|
pp = bb.codeparser.PythonParser(func, logger)
|
||||||
pp.parse_python(d.getVar(func, False))
|
pp.parse_python(d.getVar(func, False))
|
||||||
newdeps = pp.execs
|
newdeps = pp.execs
|
||||||
newdeps |= set((d.getVarFlag(func, "vardeps", True) or "").split())
|
newdeps |= set((d.getVarFlag(func, "vardeps") or "").split())
|
||||||
seen = set()
|
seen = set()
|
||||||
while newdeps:
|
while newdeps:
|
||||||
deps = newdeps
|
deps = newdeps
|
||||||
|
@ -271,7 +271,7 @@ def emit_func_python(func, o=sys.__stdout__, d = init()):
|
||||||
pp = bb.codeparser.PythonParser(dep, logger)
|
pp = bb.codeparser.PythonParser(dep, logger)
|
||||||
pp.parse_python(d.getVar(dep, False))
|
pp.parse_python(d.getVar(dep, False))
|
||||||
newdeps |= pp.execs
|
newdeps |= pp.execs
|
||||||
newdeps |= set((d.getVarFlag(dep, "vardeps", True) or "").split())
|
newdeps |= set((d.getVarFlag(dep, "vardeps") or "").split())
|
||||||
newdeps -= seen
|
newdeps -= seen
|
||||||
|
|
||||||
def update_data(d):
|
def update_data(d):
|
||||||
|
|
|
@ -108,7 +108,7 @@ class VariableParse:
|
||||||
varparse = self.d.expand_cache[key]
|
varparse = self.d.expand_cache[key]
|
||||||
var = varparse.value
|
var = varparse.value
|
||||||
else:
|
else:
|
||||||
var = self.d.getVarFlag(key, "_content", True)
|
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
|
||||||
|
@ -122,7 +122,7 @@ class VariableParse:
|
||||||
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", True)
|
vardeps = self.d.getVarFlag(self.varname, "vardeps")
|
||||||
if vardeps is None:
|
if vardeps is None:
|
||||||
parser.log.flush()
|
parser.log.flush()
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -1180,13 +1180,13 @@ class FetchData(object):
|
||||||
elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]:
|
elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]:
|
||||||
self.md5_expected = None
|
self.md5_expected = None
|
||||||
else:
|
else:
|
||||||
self.md5_expected = d.getVarFlag("SRC_URI", self.md5_name, True)
|
self.md5_expected = d.getVarFlag("SRC_URI", self.md5_name)
|
||||||
if self.sha256_name in self.parm:
|
if self.sha256_name in self.parm:
|
||||||
self.sha256_expected = self.parm[self.sha256_name]
|
self.sha256_expected = self.parm[self.sha256_name]
|
||||||
elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]:
|
elif self.type not in ["http", "https", "ftp", "ftps", "sftp"]:
|
||||||
self.sha256_expected = None
|
self.sha256_expected = None
|
||||||
else:
|
else:
|
||||||
self.sha256_expected = d.getVarFlag("SRC_URI", self.sha256_name, True)
|
self.sha256_expected = d.getVarFlag("SRC_URI", self.sha256_name)
|
||||||
self.ignore_checksums = False
|
self.ignore_checksums = False
|
||||||
|
|
||||||
self.names = self.parm.get("name",'default').split(',')
|
self.names = self.parm.get("name",'default').split(',')
|
||||||
|
|
|
@ -347,7 +347,7 @@ def finalize(fn, d, variant = None):
|
||||||
if not handlerfn:
|
if not handlerfn:
|
||||||
bb.fatal("Undefined event handler function '%s'" % var)
|
bb.fatal("Undefined event handler function '%s'" % var)
|
||||||
handlerln = int(d.getVarFlag(var, "lineno", False))
|
handlerln = int(d.getVarFlag(var, "lineno", False))
|
||||||
bb.event.register(var, d.getVar(var, False), (d.getVarFlag(var, "eventmask", True) or "").split(), handlerfn, handlerln)
|
bb.event.register(var, d.getVar(var, False), (d.getVarFlag(var, "eventmask") or "").split(), handlerfn, handlerln)
|
||||||
|
|
||||||
bb.event.fire(bb.event.RecipePreFinalise(fn), d)
|
bb.event.fire(bb.event.RecipePreFinalise(fn), d)
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,7 @@ unset B[flag]
|
||||||
f = self.parsehelper(self.unsettest)
|
f = self.parsehelper(self.unsettest)
|
||||||
d = bb.parse.handle(f.name, self.d)['']
|
d = bb.parse.handle(f.name, self.d)['']
|
||||||
self.assertEqual(d.getVar("A"), None)
|
self.assertEqual(d.getVar("A"), None)
|
||||||
self.assertEqual(d.getVarFlag("A","flag", True), None)
|
self.assertEqual(d.getVarFlag("A","flag"), None)
|
||||||
self.assertEqual(d.getVar("B"), "2")
|
self.assertEqual(d.getVar("B"), "2")
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue