[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3080/8267] terminal.py: Add compatiblity for konsole 16.08.1



commit e66f5eabed5ba7778e80026bc918e943c6d70518
Author: Davis, Michael <michael davis essvote com>
Date:   Mon Oct 17 15:57:15 2016 +0000

    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.
    
    (From OE-Core rev: f0b193b63d4c468c3aa58e15ef5a991e04b9b9a2)
    
    Signed-off-by: Michael Davis <michael davis essvote com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oe/terminal.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index 3901ad3..7446c44 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):


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]