summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-06 17:21:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-08 10:50:18 +0100
commitd6abd7559512b3de980b2495e2f5f5db25a4afed (patch)
tree51c008745b43dd4f02036323eff1e17af02ed6af /meta/lib
parentc706bfbabbf9f7caf2cf509eb91381fb49aa44cb (diff)
downloadpoky-d6abd7559512b3de980b2495e2f5f5db25a4afed.tar.gz
terminal: Drop gnome-terminal --disable-factory workarounds
With the new pid monitoring code we have for recent versions of gnome-terminal we can just drop the --disable-factory code now since the other solution handles this case as well. (From OE-Core rev: ed4957c444a2982c19e2f1f96d9afb2a992c1daf) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/terminal.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index 4a5ab1abba..6d6a29f983 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -51,7 +51,7 @@ class XTerminal(Terminal):
51 raise UnsupportedTerminal(self.name) 51 raise UnsupportedTerminal(self.name)
52 52
53class Gnome(XTerminal): 53class Gnome(XTerminal):
54 command = 'gnome-terminal -t "{title}" --disable-factory -x {command}' 54 command = 'gnome-terminal -t "{title}" -x {command}'
55 priority = 2 55 priority = 2
56 56
57 def __init__(self, sh_cmd, title=None, env=None, d=None): 57 def __init__(self, sh_cmd, title=None, env=None, d=None):
@@ -61,16 +61,9 @@ class Gnome(XTerminal):
61 # Once fixed on the gnome-terminal project, this should be removed. 61 # Once fixed on the gnome-terminal project, this should be removed.
62 if os.getenv('LC_ALL'): os.putenv('LC_ALL','') 62 if os.getenv('LC_ALL'): os.putenv('LC_ALL','')
63 63
64 # Check version
65 vernum = check_terminal_version("gnome-terminal")
66 if vernum and LooseVersion(vernum) >= '3.10':
67 logger.debug(1, 'Gnome-Terminal 3.10 or later does not support --disable-factory')
68 self.command = 'gnome-terminal -t "{title}" -x {command}'
69
70 # We need to know when the command completes but gnome-terminal gives us no way 64 # We need to know when the command completes but gnome-terminal gives us no way
71 # to do this. We therefore write the pid to a file using a "phonehome" wrapper 65 # to do this. We therefore write the pid to a file using a "phonehome" wrapper
72 # script, then monitor the pid until it exits. Thanks gnome! 66 # script, then monitor the pid until it exits. Thanks gnome!
73
74 import tempfile 67 import tempfile
75 pidfile = tempfile.NamedTemporaryFile(delete = False).name 68 pidfile = tempfile.NamedTemporaryFile(delete = False).name
76 try: 69 try: