diff options
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 cd8d124507..5db013f4dc 100644 --- a/meta/classes/terminal.bbclass +++ b/meta/classes/terminal.bbclass | |||
@@ -19,9 +19,9 @@ def emit_terminal_func(command, envdata, d): | |||
19 | envdata.setVar(cmd_func, 'exec ' + command) | 19 | envdata.setVar(cmd_func, 'exec ' + command) |
20 | envdata.setVarFlag(cmd_func, 'func', '1') | 20 | envdata.setVarFlag(cmd_func, 'func', '1') |
21 | 21 | ||
22 | runfmt = d.getVar('BB_RUNFMT', True) or "run.{func}.{pid}" | 22 | runfmt = d.getVar('BB_RUNFMT') or "run.{func}.{pid}" |
23 | runfile = runfmt.format(func=cmd_func, task=cmd_func, taskfunc=cmd_func, pid=os.getpid()) | 23 | runfile = runfmt.format(func=cmd_func, task=cmd_func, taskfunc=cmd_func, pid=os.getpid()) |
24 | runfile = os.path.join(d.getVar('T', True), runfile) | 24 | runfile = os.path.join(d.getVar('T'), runfile) |
25 | bb.utils.mkdirhier(os.path.dirname(runfile)) | 25 | bb.utils.mkdirhier(os.path.dirname(runfile)) |
26 | 26 | ||
27 | with open(runfile, 'w') as script: | 27 | with open(runfile, 'w') as script: |
@@ -44,7 +44,7 @@ def oe_terminal(command, title, d): | |||
44 | envdata.setVarFlag(v, 'export', '1') | 44 | envdata.setVarFlag(v, 'export', '1') |
45 | 45 | ||
46 | for export in oe.data.typed_value('OE_TERMINAL_EXPORTS', d): | 46 | for export in oe.data.typed_value('OE_TERMINAL_EXPORTS', d): |
47 | value = d.getVar(export, True) | 47 | value = d.getVar(export) |
48 | if value is not None: | 48 | if value is not None: |
49 | os.environ[export] = str(value) | 49 | os.environ[export] = str(value) |
50 | envdata.setVar(export, str(value)) | 50 | envdata.setVar(export, str(value)) |
@@ -60,7 +60,7 @@ def oe_terminal(command, title, d): | |||
60 | for key in origbbenv: | 60 | for key in origbbenv: |
61 | if key in envdata: | 61 | if key in envdata: |
62 | continue | 62 | continue |
63 | value = origbbenv.getVar(key, True) | 63 | value = origbbenv.getVar(key) |
64 | if value is not None: | 64 | if value is not None: |
65 | os.environ[key] = str(value) | 65 | os.environ[key] = str(value) |
66 | envdata.setVar(key, str(value)) | 66 | envdata.setVar(key, str(value)) |