aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavis, Michael <michael.davis@essvote.com>2016-10-17 15:57:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-28 11:27:33 +0100
commitf0b193b63d4c468c3aa58e15ef5a991e04b9b9a2 (patch)
tree8dc83380c9d6d3b2b144e7463e2d08653e4b5a72
parenta84ec3ac15a59f72fcb46d97942009c8e459b5d0 (diff)
downloadopenembedded-core-contrib-f0b193b63d4c468c3aa58e15ef5a991e04b9b9a2.tar.gz
openembedded-core-contrib-f0b193b63d4c468c3aa58e15ef5a991e04b9b9a2.tar.bz2
openembedded-core-contrib-f0b193b63d4c468c3aa58e15ef5a991e04b9b9a2.zip
terminal.py: Add compatiblity for konsole 16.08.1
Konsole has dropped support for the nofork flag. It has been replaced with the seperate flag. Signed-off-by: Michael Davis <michael.davis@essvote.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-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 3901ad3f26..7446c44c49 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -97,7 +97,7 @@ class Terminology(XTerminal):
priority = 2
class Konsole(XTerminal):
- command = 'konsole --nofork --workdir . -p tabtitle="{title}" -e {command}'
+ command = 'konsole --separate --workdir . -p tabtitle="{title}" -e {command}'
priority = 2
def __init__(self, sh_cmd, title=None, env=None, d=None):
@@ -106,6 +106,9 @@ class Konsole(XTerminal):
if vernum and LooseVersion(vernum) < '2.0.0':
# Konsole from KDE 3.x
self.command = 'konsole -T "{title}" -e {command}'
+ elif vernum and LooseVersion(vernum) < '16.08.1':
+ # Konsole pre 16.08.01 Has nofork
+ self.command = 'konsole --nofork --workdir . -p tabtitle="{title}" -e {command}'
XTerminal.__init__(self, sh_cmd, title, env, d)
class XTerm(XTerminal):