diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/recipetool/append.py | 6 | ||||
| -rwxr-xr-x | scripts/verify-bashisms | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py index def4f9027c..69c8bb77a0 100644 --- a/scripts/lib/recipetool/append.py +++ b/scripts/lib/recipetool/append.py @@ -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 diff --git a/scripts/verify-bashisms b/scripts/verify-bashisms index 0741e18447..a8f761d4c5 100755 --- a/scripts/verify-bashisms +++ b/scripts/verify-bashisms @@ -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)) |