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 10:23:23 +0000
commit6bba41832b465fa8c13243a5ad5f07309c2371b4 (patch)
tree7d98cfc5b1589a4543b25b0e8d2773c622a822ab
parent3c59b1bf93adb0b9f723bda1d8702c8720733677 (diff)
downloadpoky-6bba41832b465fa8c13243a5ad5f07309c2371b4.tar.gz
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>
-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):
121 logger.debug('source path: %s' % srcpath) 121 logger.debug('source path: %s' % srcpath)
122 if not srcpath.startswith('/'): 122 if not srcpath.startswith('/'):
123 # Handle non-absolute path 123 # Handle non-absolute path
124 srcpath = os.path.abspath(os.path.join(rd.getVarFlag('do_install', 'dirs', True).split()[-1], srcpath)) 124 srcpath = os.path.abspath(os.path.join(rd.getVarFlag('do_install', 'dirs').split()[-1], srcpath))
125 if srcpath.startswith(workdir): 125 if srcpath.startswith(workdir):
126 # OK, now we have the source file name, look for it in SRC_URI 126 # OK, now we have the source file name, look for it in SRC_URI
127 workdirfile = os.path.relpath(srcpath, workdir) 127 workdirfile = os.path.relpath(srcpath, workdir)
@@ -191,10 +191,10 @@ def get_source_path(cmdelements):
191def get_func_deps(func, d): 191def get_func_deps(func, d):
192 """Find the function dependencies of a shell function""" 192 """Find the function dependencies of a shell function"""
193 deps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func)) 193 deps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func))
194 deps |= set((d.getVarFlag(func, "vardeps", True) or "").split()) 194 deps |= set((d.getVarFlag(func, "vardeps") or "").split())
195 funcdeps = [] 195 funcdeps = []
196 for dep in deps: 196 for dep in deps:
197 if d.getVarFlag(dep, 'func', True): 197 if d.getVarFlag(dep, 'func'):
198 funcdeps.append(dep) 198 funcdeps.append(dep)
199 return funcdeps 199 return funcdeps
200 200
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__':
97 result = [] 97 result = []
98 data = tinfoil.parse_recipe_file(fn) 98 data = tinfoil.parse_recipe_file(fn)
99 for key in data.keys(): 99 for key in data.keys():
100 if data.getVarFlag(key, "func", True) and not data.getVarFlag(key, "python", True): 100 if data.getVarFlag(key, "func") and not data.getVarFlag(key, "python"):
101 script = data.getVar(key, False) 101 script = data.getVar(key, False)
102 if not script: continue 102 if not script: continue
103 #print ("%s:%s" % (fn, key)) 103 #print ("%s:%s" % (fn, key))