From e66f5eabed5ba7778e80026bc918e943c6d70518 Mon Sep 17 00:00:00 2001 From: "Davis, Michael" Date: Mon, 17 Oct 2016 15:57:15 +0000 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oe/terminal.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/lib/oe') 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): -- cgit v1.2.3-54-g00ecf