diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-11-25 15:28:08 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-30 15:48:09 +0000 |
commit | 1fce7ecbbb004a5ad82da3eef79cfd52b276708d (patch) | |
tree | dc19c8ecb8e0b04ba5eafd27a7679bb55585a868 /bitbake/lib/bb/parse/parse_py/ConfHandler.py | |
parent | 1d0c124cdf0282b8d139063409e40982f0ec9888 (diff) | |
download | poky-1fce7ecbbb004a5ad82da3eef79cfd52b276708d.tar.gz |
bitbake: bitbake: 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\)
(Bitbake rev: 3b45c479de8640f92dd1d9f147b02e1eecfaadc8)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/parse/parse_py/ConfHandler.py')
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py index 875250de40..5759cb20ed 100644 --- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py +++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py | |||
@@ -83,16 +83,16 @@ def include(parentfn, fn, lineno, data, error_out): | |||
83 | 83 | ||
84 | if not os.path.isabs(fn): | 84 | if not os.path.isabs(fn): |
85 | dname = os.path.dirname(parentfn) | 85 | dname = os.path.dirname(parentfn) |
86 | bbpath = "%s:%s" % (dname, data.getVar("BBPATH", True)) | 86 | bbpath = "%s:%s" % (dname, data.getVar("BBPATH")) |
87 | abs_fn, attempts = bb.utils.which(bbpath, fn, history=True) | 87 | abs_fn, attempts = bb.utils.which(bbpath, fn, history=True) |
88 | if abs_fn and bb.parse.check_dependency(data, abs_fn): | 88 | if abs_fn and bb.parse.check_dependency(data, abs_fn): |
89 | logger.warning("Duplicate inclusion for %s in %s" % (abs_fn, data.getVar('FILE', True))) | 89 | logger.warning("Duplicate inclusion for %s in %s" % (abs_fn, data.getVar('FILE'))) |
90 | for af in attempts: | 90 | for af in attempts: |
91 | bb.parse.mark_dependency(data, af) | 91 | bb.parse.mark_dependency(data, af) |
92 | if abs_fn: | 92 | if abs_fn: |
93 | fn = abs_fn | 93 | fn = abs_fn |
94 | elif bb.parse.check_dependency(data, fn): | 94 | elif bb.parse.check_dependency(data, fn): |
95 | logger.warning("Duplicate inclusion for %s in %s" % (fn, data.getVar('FILE', True))) | 95 | logger.warning("Duplicate inclusion for %s in %s" % (fn, data.getVar('FILE'))) |
96 | 96 | ||
97 | try: | 97 | try: |
98 | bb.parse.handle(fn, data, True) | 98 | bb.parse.handle(fn, data, True) |