mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
meta: 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\) (From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
d5e67725ac
commit
c4e2c59088
@@ -19,9 +19,9 @@ def emit_terminal_func(command, envdata, d):
|
||||
envdata.setVar(cmd_func, 'exec ' + command)
|
||||
envdata.setVarFlag(cmd_func, 'func', '1')
|
||||
|
||||
runfmt = d.getVar('BB_RUNFMT', True) or "run.{func}.{pid}"
|
||||
runfmt = d.getVar('BB_RUNFMT') or "run.{func}.{pid}"
|
||||
runfile = runfmt.format(func=cmd_func, task=cmd_func, taskfunc=cmd_func, pid=os.getpid())
|
||||
runfile = os.path.join(d.getVar('T', True), runfile)
|
||||
runfile = os.path.join(d.getVar('T'), runfile)
|
||||
bb.utils.mkdirhier(os.path.dirname(runfile))
|
||||
|
||||
with open(runfile, 'w') as script:
|
||||
@@ -44,7 +44,7 @@ def oe_terminal(command, title, d):
|
||||
envdata.setVarFlag(v, 'export', '1')
|
||||
|
||||
for export in oe.data.typed_value('OE_TERMINAL_EXPORTS', d):
|
||||
value = d.getVar(export, True)
|
||||
value = d.getVar(export)
|
||||
if value is not None:
|
||||
os.environ[export] = str(value)
|
||||
envdata.setVar(export, str(value))
|
||||
@@ -60,7 +60,7 @@ def oe_terminal(command, title, d):
|
||||
for key in origbbenv:
|
||||
if key in envdata:
|
||||
continue
|
||||
value = origbbenv.getVar(key, True)
|
||||
value = origbbenv.getVar(key)
|
||||
if value is not None:
|
||||
os.environ[key] = str(value)
|
||||
envdata.setVar(key, str(value))
|
||||
|
||||
Reference in New Issue
Block a user