From 69b69193411849de71cf7c81735c3239e28a2940 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 18 Jun 2015 15:14:19 +0100 Subject: 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 --- bitbake/lib/bb/ui/crumbs/builder.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/bb/ui/crumbs/builder.py') diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 455af320e8..dcc4104262 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/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 -- cgit v1.2.3-54-g00ecf