[oe-commits] [openembedded-core] 03/03: terminal: Drop gnome-terminal --disable-factory workarounds
git at git.openembedded.org
git at git.openembedded.org
Fri Jul 8 09:51:00 UTC 2016
rpurdie pushed a commit to branch master
in repository openembedded-core.
commit ed4957c444a2982c19e2f1f96d9afb2a992c1daf
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Wed Jul 6 17:21:59 2016 +0100
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.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/lib/oe/terminal.py | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index 4a5ab1a..6d6a29f 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -51,7 +51,7 @@ class XTerminal(Terminal):
raise UnsupportedTerminal(self.name)
class Gnome(XTerminal):
- command = 'gnome-terminal -t "{title}" --disable-factory -x {command}'
+ command = 'gnome-terminal -t "{title}" -x {command}'
priority = 2
def __init__(self, sh_cmd, title=None, env=None, d=None):
@@ -61,16 +61,9 @@ class Gnome(XTerminal):
# Once fixed on the gnome-terminal project, this should be removed.
if os.getenv('LC_ALL'): os.putenv('LC_ALL','')
- # Check version
- vernum = check_terminal_version("gnome-terminal")
- 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}'
-
# 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:
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list