diff options
author | Stephano Cetola <stephano.cetola@linux.intel.com> | 2016-11-14 18:30:11 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-23 11:10:13 +0000 |
commit | 93e8db222444a7aac24c5153d187bf23613c1768 (patch) | |
tree | c6c7700676884df3112a9a43545fff234484d4d9 /meta/lib | |
parent | 52f42d76773c7d696effe67866ff3c35d076f2bc (diff) | |
download | poky-93e8db222444a7aac24c5153d187bf23613c1768.tar.gz |
devshell: list commands when throwing NoSupportedTerminals
When attempting to run devshell, if no terminal is available, the
error being thrown was not very specific. This adds a list of
commands that failed, informing the user of what they can install to
fix the error.
[ YOCTO #10472]
(From OE-Core rev: c077f4aab2fc956408d4ad45c4e2e2ea6e480624)
Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/terminal.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py index 7446c44c49..38e66cef1f 100644 --- a/meta/lib/oe/terminal.py +++ b/meta/lib/oe/terminal.py | |||
@@ -11,7 +11,8 @@ class UnsupportedTerminal(Exception): | |||
11 | pass | 11 | pass |
12 | 12 | ||
13 | class NoSupportedTerminals(Exception): | 13 | class NoSupportedTerminals(Exception): |
14 | pass | 14 | def __init__(self, terms): |
15 | self.terms = terms | ||
15 | 16 | ||
16 | 17 | ||
17 | class Registry(oe.classutils.ClassRegistry): | 18 | class Registry(oe.classutils.ClassRegistry): |
@@ -209,6 +210,14 @@ class Custom(Terminal): | |||
209 | def prioritized(): | 210 | def prioritized(): |
210 | return Registry.prioritized() | 211 | return Registry.prioritized() |
211 | 212 | ||
213 | def get_cmd_list(): | ||
214 | terms = Registry.prioritized() | ||
215 | cmds = [] | ||
216 | for term in terms: | ||
217 | if term.command: | ||
218 | cmds.append(term.command) | ||
219 | return cmds | ||
220 | |||
212 | def spawn_preferred(sh_cmd, title=None, env=None, d=None): | 221 | def spawn_preferred(sh_cmd, title=None, env=None, d=None): |
213 | """Spawn the first supported terminal, by priority""" | 222 | """Spawn the first supported terminal, by priority""" |
214 | for terminal in prioritized(): | 223 | for terminal in prioritized(): |
@@ -218,7 +227,7 @@ def spawn_preferred(sh_cmd, title=None, env=None, d=None): | |||
218 | except UnsupportedTerminal: | 227 | except UnsupportedTerminal: |
219 | continue | 228 | continue |
220 | else: | 229 | else: |
221 | raise NoSupportedTerminals() | 230 | raise NoSupportedTerminals(get_cmd_list()) |
222 | 231 | ||
223 | def spawn(name, sh_cmd, title=None, env=None, d=None): | 232 | def spawn(name, sh_cmd, title=None, env=None, d=None): |
224 | """Spawn the specified terminal, by name""" | 233 | """Spawn the specified terminal, by name""" |