scripts: 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\) (From OE-Core rev: 3e4806063fe11092b2307f113a6c0b0f04104091) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
3c59b1bf93
commit
6bba41832b
|
@ -121,7 +121,7 @@ def determine_file_source(targetpath, rd):
|
|||
logger.debug('source path: %s' % srcpath)
|
||||
if not srcpath.startswith('/'):
|
||||
# Handle non-absolute path
|
||||
srcpath = os.path.abspath(os.path.join(rd.getVarFlag('do_install', 'dirs', True).split()[-1], srcpath))
|
||||
srcpath = os.path.abspath(os.path.join(rd.getVarFlag('do_install', 'dirs').split()[-1], srcpath))
|
||||
if srcpath.startswith(workdir):
|
||||
# OK, now we have the source file name, look for it in SRC_URI
|
||||
workdirfile = os.path.relpath(srcpath, workdir)
|
||||
|
@ -191,10 +191,10 @@ def get_source_path(cmdelements):
|
|||
def get_func_deps(func, d):
|
||||
"""Find the function dependencies of a shell function"""
|
||||
deps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func))
|
||||
deps |= set((d.getVarFlag(func, "vardeps", True) or "").split())
|
||||
deps |= set((d.getVarFlag(func, "vardeps") or "").split())
|
||||
funcdeps = []
|
||||
for dep in deps:
|
||||
if d.getVarFlag(dep, 'func', True):
|
||||
if d.getVarFlag(dep, 'func'):
|
||||
funcdeps.append(dep)
|
||||
return funcdeps
|
||||
|
||||
|
|
|
@ -97,7 +97,7 @@ if __name__=='__main__':
|
|||
result = []
|
||||
data = tinfoil.parse_recipe_file(fn)
|
||||
for key in data.keys():
|
||||
if data.getVarFlag(key, "func", True) and not data.getVarFlag(key, "python", True):
|
||||
if data.getVarFlag(key, "func") and not data.getVarFlag(key, "python"):
|
||||
script = data.getVar(key, False)
|
||||
if not script: continue
|
||||
#print ("%s:%s" % (fn, key))
|
||||
|
|
Loading…
Reference in New Issue