summaryrefslogtreecommitdiffstats
path: root/meta/classes/terminal.bbclass
diff options
context:
space:
mode:
authorStephano Cetola <stephano.cetola@linux.intel.com>2016-11-14 18:30:11 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-23 11:10:13 +0000
commit93e8db222444a7aac24c5153d187bf23613c1768 (patch)
treec6c7700676884df3112a9a43545fff234484d4d9 /meta/classes/terminal.bbclass
parent52f42d76773c7d696effe67866ff3c35d076f2bc (diff)
downloadpoky-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/classes/terminal.bbclass')
-rw-r--r--meta/classes/terminal.bbclass8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/terminal.bbclass b/meta/classes/terminal.bbclass
index a94f755a40..cd8d124507 100644
--- a/meta/classes/terminal.bbclass
+++ b/meta/classes/terminal.bbclass
@@ -88,8 +88,12 @@ def oe_terminal(command, title, d):
88 88
89 try: 89 try:
90 oe.terminal.spawn_preferred(command, title, None, d) 90 oe.terminal.spawn_preferred(command, title, None, d)
91 except oe.terminal.NoSupportedTerminals: 91 except oe.terminal.NoSupportedTerminals as nosup:
92 bb.fatal('No valid terminal found, unable to open devshell') 92 nosup.terms.remove("false")
93 cmds = '\n\t'.join(nosup.terms).replace("{command}",
94 "do_terminal").replace("{title}", title)
95 bb.fatal('No valid terminal found, unable to open devshell.\n' +
96 'Tried the following commands:\n\t%s' % cmds)
93 except oe.terminal.ExecutionError as exc: 97 except oe.terminal.ExecutionError as exc:
94 bb.fatal('Unable to spawn terminal %s: %s' % (terminal, exc)) 98 bb.fatal('Unable to spawn terminal %s: %s' % (terminal, exc))
95 99