MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

terminal: Drop gnome-terminal --disable-factory workarounds

Browse Source 
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>
This commit is contained in:
Richard Purdie 2016-07-06 17:21:59 +01:00
parent c706bfbabb
commit d6abd75595
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta/lib/oe/terminal.py
View File

@ -51,7 +51,7 @@ class XTerminal(Terminal):
raise UnsupportedTerminal(self.name) raise UnsupportedTerminal(self.name)
class Gnome(XTerminal): class Gnome(XTerminal):
command = 'gnome-terminal -t "{title}" --disable-factory -x {command}' command = 'gnome-terminal -t "{title}" -x {command}'
priority = 2 priority = 2
def __init__(self, sh_cmd, title=None, env=None, d=None): 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. # Once fixed on the gnome-terminal project, this should be removed.
if os.getenv('LC_ALL'): os.putenv('LC_ALL','') 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 # 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 # 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! # script, then monitor the pid until it exits. Thanks gnome!
import tempfile import tempfile
pidfile = tempfile.NamedTemporaryFile(delete = False).name pidfile = tempfile.NamedTemporaryFile(delete = False).name
try: try: