diff options
| author |   Joshua Lock <joshua.g.lock@intel.com> | 2016-11-25 15:28:08 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-30 15:47:45 +0000 |
| commit | 3b45c479de8640f92dd1d9f147b02e1eecfaadc8 (patch) | |
| tree | ba0d71bdd8028442fd06002dc09e66ddf8291f6d /bin | |
| parent | 3cb0d1c78b4c2e4f251a59b86c8da583828ad08b (diff) | |
| download | bitbake-3b45c479de8640f92dd1d9f147b02e1eecfaadc8.tar.gz | |
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\)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/bitbake-layers | 2 | ||||
| -rwxr-xr-x | bin/bitbake-worker | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/bitbake-layers b/bin/bitbake-layers index 946def220..1e2cfbcac 100755 --- a/bin/bitbake-layers +++ b/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/bin/bitbake-worker b/bin/bitbake-worker index db3c4b184..8d043946c 100755 --- a/bin/bitbake-worker +++ b/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 |