diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-10 09:52:44 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-24 15:50:26 +0000 |
| commit | fecb07755ca6aec978cac19d5cb17fdc888b0057 (patch) | |
| tree | 27f41de22af46881008bfbd70e964969ccfcda4e /meta/classes/terminal.bbclass | |
| parent | 9167f200ebc4a280c2d60dc9649f0d3be953cb26 (diff) | |
| download | openembedded-core-contrib-fecb07755ca6aec978cac19d5cb17fdc888b0057.tar.gz | |
classes: Ensure pass setVar/setVarFlag strings, not integers
This doesn't cause any issues right now but it make sense to standardise
on consistently using strings in the data store.
(From OE-Core rev: 99203fbe5ad470ef65cff93cec9d7f332883b5ee)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/terminal.bbclass')
| -rw-r--r-- | meta/classes/terminal.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass index e577c6d594..fd87cfe3d8 100644 --- a/meta/classes/terminal.bbclass +++ b/meta/classes/terminal.bbclass @@ -15,7 +15,7 @@ def emit_terminal_func(command, envdata, d): cmd_func = 'do_terminal' envdata.setVar(cmd_func, 'exec ' + command) - envdata.setVarFlag(cmd_func, 'func', 1) + envdata.setVarFlag(cmd_func, 'func', '1') runfmt = d.getVar('BB_RUNFMT', True) or "run.{func}.{pid}" runfile = runfmt.format(func=cmd_func, task=cmd_func, taskfunc=cmd_func, pid=os.getpid()) @@ -39,14 +39,14 @@ def oe_terminal(command, title, d): for v in os.environ: envdata.setVar(v, os.environ[v]) - envdata.setVarFlag(v, 'export', 1) + envdata.setVarFlag(v, 'export', '1') for export in oe.data.typed_value('OE_TERMINAL_EXPORTS', d): value = d.getVar(export, True) if value is not None: os.environ[export] = str(value) envdata.setVar(export, str(value)) - envdata.setVarFlag(export, 'export', 1) + envdata.setVarFlag(export, 'export', '1') if export == "PSEUDO_DISABLED": if "PSEUDO_UNLOAD" in os.environ: del os.environ["PSEUDO_UNLOAD"] @@ -62,7 +62,7 @@ def oe_terminal(command, title, d): if value is not None: os.environ[key] = str(value) envdata.setVar(key, str(value)) - envdata.setVarFlag(key, 'export', 1) + envdata.setVarFlag(key, 'export', '1') # A complex PS1 might need more escaping of chars. # Lets not export PS1 instead. |