summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-09-16 17:36:12 +0100
committerSaul Wold <sgw@linux.intel.com>2011-09-18 15:58:58 -0700
commitee57cd7deb778dc72e58668d8c71cf840a3bc0d9 (patch)
tree61314e124d12a40614b215ada348e9601540b1de /meta
parent4b395a9beb6c02f7b23266e7ee2ca3c08a9cbb70 (diff)
downloadopenembedded-core-ee57cd7deb778dc72e58668d8c71cf840a3bc0d9.tar.gz
openembedded-core-ee57cd7deb778dc72e58668d8c71cf840a3bc0d9.tar.bz2
openembedded-core-ee57cd7deb778dc72e58668d8c71cf840a3bc0d9.tar.xz
openembedded-core-ee57cd7deb778dc72e58668d8c71cf840a3bc0d9.zip
lib/oe/terminal.py: declare konsole from KDE 4.x as unsupported
Konsole 2.x (from KDE 4.x) does not work as devshell - it does not pass the environment or current working directory through among other issues, so do a version check and disable it if it is found (skipping to the next available terminal application.) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/terminal.py27
1 files changed, 27 insertions, 0 deletions
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index 396546259..1455e8e71 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -61,6 +61,15 @@ class Konsole(XTerminal):
command = 'konsole -T "{title}" -e {command}'
priority = 2
+ def __init__(self, command, title=None, env=None):
+ # Check version
+ vernum = check_konsole_version("konsole")
+ if vernum:
+ if vernum.split('.')[0] == "2":
+ logger.debug(1, 'Konsole from KDE 4.x will not work as devshell, skipping')
+ raise UnsupportedTerminal(self.name)
+ XTerminal.__init__(self, command, title, env)
+
class XTerm(XTerminal):
command = 'xterm -T "{title}" -e {command}'
priority = 1
@@ -104,3 +113,21 @@ def spawn(name, command, title=None, env=None):
output = pipe.communicate()[0]
if pipe.returncode != 0:
raise ExecutionError(pipe.command, pipe.returncode, output)
+
+def check_konsole_version(konsole):
+ import subprocess as sub
+ try:
+ p = sub.Popen(['sh', '-c', '%s --version' % konsole],stdout=sub.PIPE,stderr=sub.PIPE)
+ out, err = p.communicate()
+ ver_info = out.rstrip().split('\n')
+ except OSError as exc:
+ import errno
+ if exc.errno == errno.ENOENT:
+ return None
+ else:
+ raise
+ vernum = None
+ for ver in ver_info:
+ if ver.startswith('Konsole'):
+ vernum = ver.split(' ')[-1]
+ return vernum