diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2014-04-17 10:13:26 +0200 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2014-05-23 09:09:39 -0700 |
commit | 9f29399dcb9eea02efbda14cc3d5bcf2e91323f6 (patch) | |
tree | b589995917901eb501831282160a0164197ee7eb | |
parent | 6d2dcba210ac60ec709eb6956c34474a021ab425 (diff) | |
download | openembedded-core-contrib-9f29399dcb9eea02efbda14cc3d5bcf2e91323f6.tar.gz |
make menuconfig work for recent xfce environment
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.
(From OE-Core rev: d07f3812ec371da6f18fa1dd920cdde470bd89ad)
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oe/terminal.py | 12 |
1 files changed, 1 insertions, 11 deletions
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 |