diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-11-25 15:28:09 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-30 15:48:09 +0000 |
commit | ddaac5e4e3ebe71cb279a33a6585b3e8a8790e55 (patch) | |
tree | 5dc9c0d3e1da1edacad1e6b8748c4db22026f011 /bitbake/lib/bb/data.py | |
parent | 1fce7ecbbb004a5ad82da3eef79cfd52b276708d (diff) | |
download | poky-ddaac5e4e3ebe71cb279a33a6585b3e8a8790e55.tar.gz |
bitbake: bitbake: 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\)
(Bitbake rev: c19baa8c19ea8ab9b9b64fd30298d8764c6fd2cd)
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/data.py')
-rw-r--r-- | bitbake/lib/bb/data.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 02a1140d0f..0f05b609e0 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py | |||
@@ -226,7 +226,7 @@ def emit_func(func, o=sys.__stdout__, d = init()): | |||
226 | o.write('\n') | 226 | o.write('\n') |
227 | emit_var(func, o, d, False) and o.write('\n') | 227 | emit_var(func, o, d, False) and o.write('\n') |
228 | newdeps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func)) | 228 | newdeps = bb.codeparser.ShellParser(func, logger).parse_shell(d.getVar(func)) |
229 | newdeps |= set((d.getVarFlag(func, "vardeps", True) or "").split()) | 229 | newdeps |= set((d.getVarFlag(func, "vardeps") or "").split()) |
230 | seen = set() | 230 | seen = set() |
231 | while newdeps: | 231 | while newdeps: |
232 | deps = newdeps | 232 | deps = newdeps |
@@ -236,7 +236,7 @@ def emit_func(func, o=sys.__stdout__, d = init()): | |||
236 | if d.getVarFlag(dep, "func", False) and not d.getVarFlag(dep, "python", False): | 236 | if d.getVarFlag(dep, "func", False) and not d.getVarFlag(dep, "python", False): |
237 | emit_var(dep, o, d, False) and o.write('\n') | 237 | emit_var(dep, o, d, False) and o.write('\n') |
238 | newdeps |= bb.codeparser.ShellParser(dep, logger).parse_shell(d.getVar(dep)) | 238 | newdeps |= bb.codeparser.ShellParser(dep, logger).parse_shell(d.getVar(dep)) |
239 | newdeps |= set((d.getVarFlag(dep, "vardeps", True) or "").split()) | 239 | newdeps |= set((d.getVarFlag(dep, "vardeps") or "").split()) |
240 | newdeps -= seen | 240 | newdeps -= seen |
241 | 241 | ||
242 | _functionfmt = """ | 242 | _functionfmt = """ |
@@ -259,7 +259,7 @@ def emit_func_python(func, o=sys.__stdout__, d = init()): | |||
259 | pp = bb.codeparser.PythonParser(func, logger) | 259 | pp = bb.codeparser.PythonParser(func, logger) |
260 | pp.parse_python(d.getVar(func, False)) | 260 | pp.parse_python(d.getVar(func, False)) |
261 | newdeps = pp.execs | 261 | newdeps = pp.execs |
262 | newdeps |= set((d.getVarFlag(func, "vardeps", True) or "").split()) | 262 | newdeps |= set((d.getVarFlag(func, "vardeps") or "").split()) |
263 | seen = set() | 263 | seen = set() |
264 | while newdeps: | 264 | while newdeps: |
265 | deps = newdeps | 265 | deps = newdeps |
@@ -271,7 +271,7 @@ def emit_func_python(func, o=sys.__stdout__, d = init()): | |||
271 | pp = bb.codeparser.PythonParser(dep, logger) | 271 | pp = bb.codeparser.PythonParser(dep, logger) |
272 | pp.parse_python(d.getVar(dep, False)) | 272 | pp.parse_python(d.getVar(dep, False)) |
273 | newdeps |= pp.execs | 273 | newdeps |= pp.execs |
274 | newdeps |= set((d.getVarFlag(dep, "vardeps", True) or "").split()) | 274 | newdeps |= set((d.getVarFlag(dep, "vardeps") or "").split()) |
275 | newdeps -= seen | 275 | newdeps -= seen |
276 | 276 | ||
277 | def update_data(d): | 277 | def update_data(d): |