From 1fce7ecbbb004a5ad82da3eef79cfd52b276708d Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Fri, 25 Nov 2016 15:28:08 +0000 Subject: bitbake: bitbake: remove True option to getVar calls getVar() now defaults to expanding by default, thus remove the True option from getVar() calls with a regex search and replace. Search made with the following regex: getVar ?\(( ?[^,()]*), True\) (Bitbake rev: 3b45c479de8640f92dd1d9f147b02e1eecfaadc8) Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- bitbake/bin/bitbake-layers | 2 +- bitbake/bin/bitbake-worker | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'bitbake/bin') diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers index 946def220c..1e2cfbcac1 100755 --- a/bitbake/bin/bitbake-layers +++ b/bitbake/bin/bitbake-layers @@ -89,7 +89,7 @@ def main(): tinfoil = tinfoil_init(False) try: for path in ([topdir] + - tinfoil.config_data.getVar('BBPATH', True).split(':')): + tinfoil.config_data.getVar('BBPATH').split(':')): pluginpath = os.path.join(path, 'lib', 'bblayers') bb.utils.load_plugins(logger, plugins, pluginpath) diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker index db3c4b184f..8d043946cb 100755 --- a/bitbake/bin/bitbake-worker +++ b/bitbake/bin/bitbake-worker @@ -228,7 +228,7 @@ def fork_off_task(cfg, data, databuilder, workerdata, fn, task, taskname, append the_data = bb_cache.loadDataFull(fn, appends) the_data.setVar('BB_TASKHASH', workerdata["runq_hash"][task]) - bb.utils.set_process_name("%s:%s" % (the_data.getVar("PN", True), taskname.replace("do_", ""))) + bb.utils.set_process_name("%s:%s" % (the_data.getVar("PN"), taskname.replace("do_", ""))) # exported_vars() returns a generator which *cannot* be passed to os.environ.update() # successfully. We also need to unset anything from the environment which shouldn't be there @@ -247,7 +247,7 @@ def fork_off_task(cfg, data, databuilder, workerdata, fn, task, taskname, append if task_exports: for e in task_exports.split(): the_data.setVarFlag(e, 'export', '1') - v = the_data.getVar(e, True) + v = the_data.getVar(e) if v is not None: os.environ[e] = v -- cgit v1.2.3-54-g00ecf