[oe-commits] [openembedded-core] 05/73: terminal.py: Add compatiblity for konsole 16.08.1

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit f0b193b63d4c468c3aa58e15ef5a991e04b9b9a2
Author: Davis, Michael <michael.davis at essvote.com>
AuthorDate: 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.
    
    Signed-off-by: Michael Davis <michael.davis at essvote.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/lib/oe/terminal.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.