summaryrefslogtreecommitdiffstats
path: root/meta/classes/terminal.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-10 09:52:44 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-24 15:50:26 +0000
commitfecb07755ca6aec978cac19d5cb17fdc888b0057 (patch)
tree27f41de22af46881008bfbd70e964969ccfcda4e /meta/classes/terminal.bbclass
parent9167f200ebc4a280c2d60dc9649f0d3be953cb26 (diff)
downloadpoky-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.bbclass8
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):
15 cmd_func = 'do_terminal' 15 cmd_func = 'do_terminal'
16 16
17 envdata.setVar(cmd_func, 'exec ' + command) 17 envdata.setVar(cmd_func, 'exec ' + command)
18 envdata.setVarFlag(cmd_func, 'func', 1) 18 envdata.setVarFlag(cmd_func, 'func', '1')
19 19
20 runfmt = d.getVar('BB_RUNFMT', True) or "run.{func}.{pid}" 20 runfmt = d.getVar('BB_RUNFMT', True) or "run.{func}.{pid}"
21 runfile = runfmt.format(func=cmd_func, task=cmd_func, taskfunc=cmd_func, pid=os.getpid()) 21 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):
39 39
40 for v in os.environ: 40 for v in os.environ:
41 envdata.setVar(v, os.environ[v]) 41 envdata.setVar(v, os.environ[v])
42 envdata.setVarFlag(v, 'export', 1) 42 envdata.setVarFlag(v, 'export', '1')
43 43
44 for export in oe.data.typed_value('OE_TERMINAL_EXPORTS', d): 44 for export in oe.data.typed_value('OE_TERMINAL_EXPORTS', d):
45 value = d.getVar(export, True) 45 value = d.getVar(export, True)
46 if value is not None: 46 if value is not None:
47 os.environ[export] = str(value) 47 os.environ[export] = str(value)
48 envdata.setVar(export, str(value)) 48 envdata.setVar(export, str(value))
49 envdata.setVarFlag(export, 'export', 1) 49 envdata.setVarFlag(export, 'export', '1')
50 if export == "PSEUDO_DISABLED": 50 if export == "PSEUDO_DISABLED":
51 if "PSEUDO_UNLOAD" in os.environ: 51 if "PSEUDO_UNLOAD" in os.environ:
52 del os.environ["PSEUDO_UNLOAD"] 52 del os.environ["PSEUDO_UNLOAD"]
@@ -62,7 +62,7 @@ def oe_terminal(command, title, d):
62 if value is not None: 62 if value is not None:
63 os.environ[key] = str(value) 63 os.environ[key] = str(value)
64 envdata.setVar(key, str(value)) 64 envdata.setVar(key, str(value))
65 envdata.setVarFlag(key, 'export', 1) 65 envdata.setVarFlag(key, 'export', '1')
66 66
67 # A complex PS1 might need more escaping of chars. 67 # A complex PS1 might need more escaping of chars.
68 # Lets not export PS1 instead. 68 # Lets not export PS1 instead.