From d07f3812ec371da6f18fa1dd920cdde470bd89ad Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Thu, 17 Apr 2014 10:13:26 +0200 Subject: make menuconfig work for recent xfce environment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit xfce terminal was renamed 'Terminal' -> 'xfce4-teminal' mainline end of 2012, so the distros supporting 'Terminal' will dissapear. The distros not mentionied in __init__ do (e.g fedora 19 - tested) fail - or will fail sooner or later. Signed-off-by: Andreas Müller Signed-off-by: Richard Purdie --- meta/lib/oe/terminal.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'meta') diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py index a33abd733d..0a623c75b1 100644 --- a/meta/lib/oe/terminal.py +++ b/meta/lib/oe/terminal.py @@ -60,19 +60,9 @@ class Mate(XTerminal): priority = 2 class Xfce(XTerminal): - command = 'Terminal -T "{title}" -e "{command}"' + command = 'xfce4-terminal -T "{title}" -e "{command}"' priority = 2 - def __init__(self, command, title=None, env=None, d=None): - # Upstream binary name is Terminal but Debian/Ubuntu use - # xfce4-terminal to avoid possible(?) conflicts - distro = distro_name() - if distro == 'ubuntu' or distro == 'debian': - cmd = 'xfce4-terminal -T "{title}" -e "{command}"' - else: - cmd = command - XTerminal.__init__(self, cmd, title, env, d) - class Konsole(XTerminal): command = 'konsole -T "{title}" -e {command}' priority = 2 -- cgit 1.2.3-korg