From c706bfbabbf9f7caf2cf509eb91381fb49aa44cb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 6 Jul 2016 17:08:57 +0100 Subject: terminal: Fix gnome-terminal to work with recent versions Currently gnome-terminal just returns straight away, opening a terminal in a new separate process we have no insight into. For patch resolution, this leads to spawning many different terminal windows, for pydevshell, it just flashes a window up and then closes. We need to block until the command completes but gnome-terminal gives us no way to do this. We therefore write the pid to a file using a "phonehome" wrapper script, then monitor the pid until it exits. [YOCTO #7254] (also fixing do_devpyshell) (From OE-Core rev: 76e8ab47c936674b8bb9bf1c48de53b30f5bf74a) Signed-off-by: Richard Purdie --- meta/lib/oe/terminal.py | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) (limited to 'meta/lib') diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py index 7f4458ea33..4a5ab1abba 100644 --- a/meta/lib/oe/terminal.py +++ b/meta/lib/oe/terminal.py @@ -66,7 +66,28 @@ class Gnome(XTerminal): if vernum and LooseVersion(vernum) >= '3.10': logger.debug(1, 'Gnome-Terminal 3.10 or later does not support --disable-factory') self.command = 'gnome-terminal -t "{title}" -x {command}' - XTerminal.__init__(self, sh_cmd, title, env, d) + + # We need to know when the command completes but gnome-terminal gives us no way + # to do this. We therefore write the pid to a file using a "phonehome" wrapper + # script, then monitor the pid until it exits. Thanks gnome! + + import tempfile + pidfile = tempfile.NamedTemporaryFile(delete = False).name + try: + sh_cmd = "oe-gnome-terminal-phonehome " + pidfile + " " + sh_cmd + XTerminal.__init__(self, sh_cmd, title, env, d) + while os.stat(pidfile).st_size <= 0: + continue + with open(pidfile, "r") as f: + pid = int(f.readline()) + finally: + os.unlink(pidfile) + + while True: + try: + os.kill(pid, 0) + except OSError: + return class Mate(XTerminal): command = 'mate-terminal -t "{title}" -x {command}' -- cgit 1.2.3-korg