[oe-commits] =?UTF-8?Q?Andreas=20M=C3=BCller=20?=: make menuconfig work for recent xfce environment
git at git.openembedded.org
git at git.openembedded.org
Sat Apr 19 15:25:40 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: 5dc2588200155c0d2b6c04261df8df4a0821a145
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=5dc2588200155c0d2b6c04261df8df4a0821a145
Author: Andreas Müller <schnitzeltony at googlemail.com>
Date: Thu Apr 17 10:13:26 2014 +0200
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.
Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/lib/oe/terminal.py | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index a33abd7..0a623c7 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
More information about the Openembedded-commits
mailing list