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-19 22:43:48 +0100 |
| commit | 659ef95c9b8aced3c4ded81c48bcc0fbde4d429f (patch) | |
| tree | c63666710636bf12d25ef5a491f5d1abbcca4f96 /lib/bb/ui/crumbs | |
| parent | 5ecd6a671c088f270d5f49093f8da83278fc0aa9 (diff) | |
| download | openembedded-core-contrib-659ef95c9b8aced3c4ded81c48bcc0fbde4d429f.tar.gz | |
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 *`
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/ui/crumbs')
| -rwxr-xr-x | lib/bb/ui/crumbs/builder.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/bb/ui/crumbs/builder.py b/lib/bb/ui/crumbs/builder.py index 455af320e8..dcc4104262 100755 --- a/lib/bb/ui/crumbs/builder.py +++ b/lib/bb/ui/crumbs/builder.py @@ -309,7 +309,7 @@ class Parameters: def hob_conf_filter(fn, data): if fn.endswith("/local.conf"): - distro = data.getVar("DISTRO_HOB") + distro = data.getVar("DISTRO_HOB", False) if distro: if distro != "defaultsetup": data.setVar("DISTRO", distro) @@ -320,13 +320,13 @@ def hob_conf_filter(fn, data): "BB_NUMBER_THREADS_HOB", "PARALLEL_MAKE_HOB", "DL_DIR_HOB", \ "SSTATE_DIR_HOB", "SSTATE_MIRRORS_HOB", "INCOMPATIBLE_LICENSE_HOB"] for key in keys: - var_hob = data.getVar(key) + var_hob = data.getVar(key, False) if var_hob: data.setVar(key.split("_HOB")[0], var_hob) return if fn.endswith("/bblayers.conf"): - layers = data.getVar("BBLAYERS_HOB") + layers = data.getVar("BBLAYERS_HOB", False) if layers: data.setVar("BBLAYERS", layers) return |