summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-18 15:14:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-23 11:57:53 +0100
commit69b69193411849de71cf7c81735c3239e28a2940 (patch)
tree054081264a49c9aa3002bc358ab0c4d7b7239015 /bitbake/lib/bb/ui
parent86d30d756a60d181a95cf07041920a367a0cd0ba (diff)
downloadpoky-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/ui')
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py6
1 files changed, 3 insertions, 3 deletions
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:
309 309
310def hob_conf_filter(fn, data): 310def hob_conf_filter(fn, data):
311 if fn.endswith("/local.conf"): 311 if fn.endswith("/local.conf"):
312 distro = data.getVar("DISTRO_HOB") 312 distro = data.getVar("DISTRO_HOB", False)
313 if distro: 313 if distro:
314 if distro != "defaultsetup": 314 if distro != "defaultsetup":
315 data.setVar("DISTRO", distro) 315 data.setVar("DISTRO", distro)
@@ -320,13 +320,13 @@ def hob_conf_filter(fn, data):
320 "BB_NUMBER_THREADS_HOB", "PARALLEL_MAKE_HOB", "DL_DIR_HOB", \ 320 "BB_NUMBER_THREADS_HOB", "PARALLEL_MAKE_HOB", "DL_DIR_HOB", \
321 "SSTATE_DIR_HOB", "SSTATE_MIRRORS_HOB", "INCOMPATIBLE_LICENSE_HOB"] 321 "SSTATE_DIR_HOB", "SSTATE_MIRRORS_HOB", "INCOMPATIBLE_LICENSE_HOB"]
322 for key in keys: 322 for key in keys:
323 var_hob = data.getVar(key) 323 var_hob = data.getVar(key, False)
324 if var_hob: 324 if var_hob:
325 data.setVar(key.split("_HOB")[0], var_hob) 325 data.setVar(key.split("_HOB")[0], var_hob)
326 return 326 return
327 327
328 if fn.endswith("/bblayers.conf"): 328 if fn.endswith("/bblayers.conf"):
329 layers = data.getVar("BBLAYERS_HOB") 329 layers = data.getVar("BBLAYERS_HOB", False)
330 if layers: 330 if layers:
331 data.setVar("BBLAYERS", layers) 331 data.setVar("BBLAYERS", layers)
332 return 332 return