summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorJoe Slater <joe.slater@windriver.com>2020-05-21 11:41:07 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-27 11:04:47 +0100
commite620119715673af7dc7c24a0c643bcab6dce71d0 (patch)
tree4516d716e295109b10cfa2241d9c6420ef198885 /meta/lib/oe
parentedbf8d3999126e3c271a47dada54d1724f59f573 (diff)
downloadpoky-e620119715673af7dc7c24a0c643bcab6dce71d0.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. (From OE-Core rev: 6e4babdeee38d32002a4c9129e77466ae4156dd7) Signed-off-by: Joe Slater <joe.slater@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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):
207 spawn(terminal.name, sh_cmd, title, env, d) 207 spawn(terminal.name, sh_cmd, title, env, d)
208 break 208 break
209 except UnsupportedTerminal: 209 except UnsupportedTerminal:
210 continue 210 pass
211 except:
212 bb.warn("Terminal %s is supported but did not start" % (terminal.name))
213 # when we've run out of options
211 else: 214 else:
212 raise NoSupportedTerminals(get_cmd_list()) 215 raise NoSupportedTerminals(get_cmd_list())
213 216