diff options
| author | Jason Wessel <jason.wessel@windriver.com> | 2012-09-17 17:43:50 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-24 15:35:30 +0100 |
| commit | 6e0713a3e7765bafebd48e33b943f83ac17720ea (patch) | |
| tree | 058e11f349358a9533449ac4542a02531b6f899c /meta/classes/terminal.bbclass | |
| parent | e1c1ee19e04eca1ffd09b49104a7b49e89c74d12 (diff) | |
| download | poky-6e0713a3e7765bafebd48e33b943f83ac17720ea.tar.gz | |
terminal: pass data store all the way through to terminal class
Passing the data store will be needed for firing a custom event
for the screen class.
(From OE-Core rev: 5ccff8d44626bfd3d1af2a7f81f0567997277809)
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/terminal.bbclass')
| -rw-r--r-- | meta/classes/terminal.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass index 3cfc84b444..2cd6f4c34f 100644 --- a/meta/classes/terminal.bbclass +++ b/meta/classes/terminal.bbclass | |||
| @@ -25,7 +25,7 @@ def oe_terminal(command, title, d): | |||
| 25 | bb.fatal('Devshell usage disabled with OE_TERMINAL') | 25 | bb.fatal('Devshell usage disabled with OE_TERMINAL') |
| 26 | elif terminal != 'auto': | 26 | elif terminal != 'auto': |
| 27 | try: | 27 | try: |
| 28 | oe.terminal.spawn(terminal, command, title) | 28 | oe.terminal.spawn(terminal, command, title, None, d) |
| 29 | return | 29 | return |
| 30 | except oe.terminal.UnsupportedTerminal: | 30 | except oe.terminal.UnsupportedTerminal: |
| 31 | bb.warn('Unsupported terminal "%s", defaulting to "auto"' % | 31 | bb.warn('Unsupported terminal "%s", defaulting to "auto"' % |
| @@ -34,7 +34,7 @@ def oe_terminal(command, title, d): | |||
| 34 | bb.fatal('Unable to spawn terminal %s: %s' % (terminal, exc)) | 34 | bb.fatal('Unable to spawn terminal %s: %s' % (terminal, exc)) |
| 35 | 35 | ||
| 36 | try: | 36 | try: |
| 37 | oe.terminal.spawn_preferred(command, title) | 37 | oe.terminal.spawn_preferred(command, title, None, d) |
| 38 | except oe.terminal.NoSupportedTerminals: | 38 | except oe.terminal.NoSupportedTerminals: |
| 39 | bb.fatal('No valid terminal found, unable to open devshell') | 39 | bb.fatal('No valid terminal found, unable to open devshell') |
| 40 | except oe.terminal.ExecutionError as exc: | 40 | except oe.terminal.ExecutionError as exc: |
