summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@googlemail.com>2014-04-17 10:13:26 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-23 11:43:27 +0100
commitbb3f5ce741d99ea98a0613d67515447d04ea9362 (patch)
tree1b3143531837cfaffb196e707c7a1ec3ba0fd547
parent07cb1c02dc07ae3b17e8b6a3040ae6df67086082 (diff)
downloadpoky-bb3f5ce741d99ea98a0613d67515447d04ea9362.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.py12
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):
60 priority = 2 60 priority = 2
61 61
62class Xfce(XTerminal): 62class Xfce(XTerminal):
63 command = 'Terminal -T "{title}" -e "{command}"' 63 command = 'xfce4-terminal -T "{title}" -e "{command}"'
64 priority = 2 64 priority = 2
65 65
66 def __init__(self, command, title=None, env=None, d=None):
67 # Upstream binary name is Terminal but Debian/Ubuntu use
68 # xfce4-terminal to avoid possible(?) conflicts
69 distro = distro_name()
70 if distro == 'ubuntu' or distro == 'debian':
71 cmd = 'xfce4-terminal -T "{title}" -e "{command}"'
72 else:
73 cmd = command
74 XTerminal.__init__(self, cmd, title, env, d)
75
76class Konsole(XTerminal): 66class Konsole(XTerminal):
77 command = 'konsole -T "{title}" -e {command}' 67 command = 'konsole -T "{title}" -e {command}'
78 priority = 2 68 priority = 2