summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorJoe Slater <joe.slater@windriver.com>2020-05-21 11:41:07 -0700
committerSteve Sakoman <steve@sakoman.com>2020-05-27 04:22:34 -1000
commit5ca00faa9c085fef1781b66561de461e9cc5b117 (patch)
treef79d2867eb30a7322129126a5896e0f9a929513f /meta/lib/oe
parent0b513274a0ae722065cf1a605090000e854e2f81 (diff)
downloadopenembedded-core-contrib-5ca00faa9c085fef1781b66561de461e9cc5b117.tar.gz
terminal.py: do not stop searching for auto
If a terminal fails to spawn() we should continue looking. gnome-terminal, in particular can be present but not start. Signed-off-by: Joe Slater <joe.slater@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 6e4babdeee38d32002a4c9129e77466ae4156dd7) Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/terminal.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index a1daa2bed6..eb10a6e33e 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -207,7 +207,10 @@ def spawn_preferred(sh_cmd, title=None, env=None, d=None):
spawn(terminal.name, sh_cmd, title, env, d)
break
except UnsupportedTerminal:
- continue
+ pass
+ except:
+ bb.warn("Terminal %s is supported but did not start" % (terminal.name))
+ # when we've run out of options
else:
raise NoSupportedTerminals(get_cmd_list())