diff options
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/lib/oe/terminal.py | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py index 43639d5ddd..28abf147b9 100644 --- a/meta/lib/oe/terminal.py +++ b/meta/lib/oe/terminal.py @@ -28,11 +28,10 @@ class Registry(oe.classutils.ClassRegistry): class Terminal(Popen): __metaclass__ = Registry - def __init__(self, command, title=None, env=None): - self.format_command(command, title) - + def __init__(self, sh_cmd, title=None, env=None): + fmt_sh_cmd = self.format_command(sh_cmd, title) try: - Popen.__init__(self, self.command, env=env) + Popen.__init__(self, fmt_sh_cmd, env=env) except OSError as exc: import errno if exc.errno == errno.ENOENT: @@ -40,16 +39,16 @@ class Terminal(Popen): else: raise - def format_command(self, command, title): - fmt = {'title': title or 'Terminal', 'command': command} + def format_command(self, sh_cmd, title): + fmt = {'title': title or 'Terminal', 'command': sh_cmd} if isinstance(self.command, basestring): - self.command = shlex.split(self.command.format(**fmt)) + return shlex.split(self.command.format(**fmt)) else: - self.command = [element.format(**fmt) for element in self.command] + return [element.format(**fmt) for element in self.command] class XTerminal(Terminal): - def __init__(self, command, title=None, env=None): - Terminal.__init__(self, command, title, env) + def __init__(self, sh_cmd, title=None, env=None): + Terminal.__init__(self, sh_cmd, title, env) if not os.environ.get('DISPLAY'): raise UnsupportedTerminal(self.name) @@ -75,14 +74,14 @@ class Konsole(XTerminal): command = 'konsole -T "{title}" -e {command}' priority = 2 - def __init__(self, command, title=None, env=None): + def __init__(self, sh_cmd, 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) + XTerminal.__init__(self, sh_cmd, title, env) class XTerm(XTerminal): command = 'xterm -T "{title}" -e {command}' @@ -95,8 +94,8 @@ class Rxvt(XTerminal): class Screen(Terminal): command = 'screen -D -m -t "{title}" -S devshell {command}' - def __init__(self, command, title=None, env=None): - Terminal.__init__(self, command, title, env) + def __init__(self, sh_cmd, title=None, env=None): + Terminal.__init__(self, sh_cmd, title, env) logger.warn('Screen started. Please connect in another terminal with ' '"screen -r devshell"') @@ -104,18 +103,18 @@ class Screen(Terminal): def prioritized(): return Registry.prioritized() -def spawn_preferred(command, title=None, env=None): +def spawn_preferred(sh_cmd, title=None, env=None): """Spawn the first supported terminal, by priority""" for terminal in prioritized(): try: - spawn(terminal.name, command, title, env) + spawn(terminal.name, sh_cmd, title, env) break except UnsupportedTerminal: continue else: raise NoSupportedTerminals() -def spawn(name, command, title=None, env=None): +def spawn(name, sh_cmd, title=None, env=None): """Spawn the specified terminal, by name""" logger.debug(1, 'Attempting to spawn terminal "%s"', name) try: @@ -123,10 +122,10 @@ def spawn(name, command, title=None, env=None): except KeyError: raise UnsupportedTerminal(name) - pipe = terminal(command, title, env) + pipe = terminal(sh_cmd, title, env) output = pipe.communicate()[0] if pipe.returncode != 0: - raise ExecutionError(pipe.command, pipe.returncode, output) + raise ExecutionError(sh_cmd, pipe.returncode, output) def check_konsole_version(konsole): import subprocess as sub |