diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-18 15:14:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-23 11:57:53 +0100 |
commit | 69b69193411849de71cf7c81735c3239e28a2940 (patch) | |
tree | 054081264a49c9aa3002bc358ab0c4d7b7239015 /bitbake/lib/bb/cookerdata.py | |
parent | 86d30d756a60d181a95cf07041920a367a0cd0ba (diff) | |
download | poky-69b69193411849de71cf7c81735c3239e28a2940.tar.gz |
bitbake: bitbake: Add explict getVar param for (non) expansion
Rather than just use d.getVar(X), use the more explict d.getVar(X, False)
since at some point in the future, having the default of expansion would
be nice. This is the first step towards that.
This patch was mostly made using the command:
sed -e 's:\(getVar([^,()]*\)\s*):\1, False):g' -i `grep -ril getVar *`
(Bitbake rev: 659ef95c9b8aced3c4ded81c48bcc0fbde4d429f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/cookerdata.py')
-rw-r--r-- | bitbake/lib/bb/cookerdata.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bitbake/lib/bb/cookerdata.py b/bitbake/lib/bb/cookerdata.py index 630ee27589..0ca87a094e 100644 --- a/bitbake/lib/bb/cookerdata.py +++ b/bitbake/lib/bb/cookerdata.py | |||
@@ -301,15 +301,15 @@ class CookerDataBuilder(object): | |||
301 | 301 | ||
302 | # Nomally we only register event handlers at the end of parsing .bb files | 302 | # Nomally we only register event handlers at the end of parsing .bb files |
303 | # We register any handlers we've found so far here... | 303 | # We register any handlers we've found so far here... |
304 | for var in data.getVar('__BBHANDLERS') or []: | 304 | for var in data.getVar('__BBHANDLERS', False) or []: |
305 | bb.event.register(var, data.getVar(var), (data.getVarFlag(var, "eventmask", True) or "").split()) | 305 | bb.event.register(var, data.getVar(var, False), (data.getVarFlag(var, "eventmask", True) or "").split()) |
306 | 306 | ||
307 | if data.getVar("BB_WORKERCONTEXT", False) is None: | 307 | if data.getVar("BB_WORKERCONTEXT", False) is None: |
308 | bb.fetch.fetcher_init(data) | 308 | bb.fetch.fetcher_init(data) |
309 | bb.codeparser.parser_cache_init(data) | 309 | bb.codeparser.parser_cache_init(data) |
310 | bb.event.fire(bb.event.ConfigParsed(), data) | 310 | bb.event.fire(bb.event.ConfigParsed(), data) |
311 | 311 | ||
312 | if data.getVar("BB_INVALIDCONF") is True: | 312 | if data.getVar("BB_INVALIDCONF", False) is True: |
313 | data.setVar("BB_INVALIDCONF", False) | 313 | data.setVar("BB_INVALIDCONF", False) |
314 | self.parseConfigurationFiles(self.prefiles, self.postfiles) | 314 | self.parseConfigurationFiles(self.prefiles, self.postfiles) |
315 | return | 315 | return |