]> code.ossystems Code Review - openembedded-core.git/commitdiff
terminal.py: Add compatiblity for konsole 16.08.1
authorDavis, Michael <michael.davis@essvote.com>
Mon, 17 Oct 2016 15:57:15 +0000 (15:57 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 28 Oct 2016 10:27:33 +0000 (11:27 +0100)
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>
meta/lib/oe/terminal.py

index 3901ad3f26b3dcbdae1921278e4ef033b23df34b..7446c44c49336e991f37d598c2a62943003a83bb 100644 (file)
@@ -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):