diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:05 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c0f2890c01882e9ea14e781c044f3a84f75bd0fc (patch) | |
tree | 0962d17b0bf752ba4c009fb624f044b89fd6fd87 /scripts/lib/devtool/search.py | |
parent | c4e2c59088765d1f1de7ec57cde91980f887c2ff (diff) | |
download | poky-c0f2890c01882e9ea14e781c044f3a84f75bd0fc.tar.gz |
scripts: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 0a36bd96e6b29fd99a296efc358ca3e9fb5af735)
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>
Diffstat (limited to 'scripts/lib/devtool/search.py')
-rw-r--r-- | scripts/lib/devtool/search.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/devtool/search.py b/scripts/lib/devtool/search.py index b44bed7f6f..054985b85d 100644 --- a/scripts/lib/devtool/search.py +++ b/scripts/lib/devtool/search.py | |||
@@ -31,7 +31,7 @@ def search(args, config, basepath, workspace): | |||
31 | 31 | ||
32 | tinfoil = setup_tinfoil(config_only=False, basepath=basepath) | 32 | tinfoil = setup_tinfoil(config_only=False, basepath=basepath) |
33 | try: | 33 | try: |
34 | pkgdata_dir = tinfoil.config_data.getVar('PKGDATA_DIR', True) | 34 | pkgdata_dir = tinfoil.config_data.getVar('PKGDATA_DIR') |
35 | defsummary = tinfoil.config_data.getVar('SUMMARY', False) or '' | 35 | defsummary = tinfoil.config_data.getVar('SUMMARY', False) or '' |
36 | 36 | ||
37 | keyword_rc = re.compile(args.keyword) | 37 | keyword_rc = re.compile(args.keyword) |
@@ -70,7 +70,7 @@ def search(args, config, basepath, workspace): | |||
70 | 70 | ||
71 | if match: | 71 | if match: |
72 | rd = parse_recipe(config, tinfoil, fn, True) | 72 | rd = parse_recipe(config, tinfoil, fn, True) |
73 | summary = rd.getVar('SUMMARY', True) | 73 | summary = rd.getVar('SUMMARY') |
74 | if summary == rd.expand(defsummary): | 74 | if summary == rd.expand(defsummary): |
75 | summary = '' | 75 | summary = '' |
76 | print("%s %s" % (fn.ljust(20), summary)) | 76 | print("%s %s" % (fn.ljust(20), summary)) |