summaryrefslogtreecommitdiffstats
path: root/meta/lib
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-06-05 21:36:30 +0100
commit7f887005f956fe8134f1b13caa4711f21fcfa7b0 (patch)
tree7651e570956e30dcdc64781826e282712844efa1 /meta/lib
parent53559bb82dc42386383e23aaf88a1bc06301d062 (diff)
downloadpoky-7f887005f956fe8134f1b13caa4711f21fcfa7b0.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: 5ca00faa9c085fef1781b66561de461e9cc5b117) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-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