summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-12-14 21:13:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-16 08:30:03 +0000
commit3e4806063fe11092b2307f113a6c0b0f04104091 (patch)
treefe693de6aed3312a176442c2e5a96578e296feec
parent2dea9e490a98377010b3d4118d054814c317a735 (diff)
downloadopenembedded-core-contrib-3e4806063fe11092b2307f113a6c0b0f04104091.tar.gz
openembedded-core-contrib-3e4806063fe11092b2307f113a6c0b0f04104091.tar.bz2
openembedded-core-contrib-3e4806063fe11092b2307f113a6c0b0f04104091.zip
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\) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--scripts/lib/recipetool/append.py6
-rwxr-xr-xscripts/verify-bashisms2
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))