From 7f887005f956fe8134f1b13caa4711f21fcfa7b0 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Thu, 21 May 2020 11:41:07 -0700 Subject: 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. (From OE-Core rev: 5ca00faa9c085fef1781b66561de461e9cc5b117) Signed-off-by: Joe Slater Signed-off-by: Richard Purdie (cherry picked from commit 6e4babdeee38d32002a4c9129e77466ae4156dd7) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/lib/oe/terminal.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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()) -- cgit v1.2.3-54-g00ecf