Changeset 1183:541b75eeb852

Timestamp:

06/10/08 01:16:11 (3 months ago)

Author:

Ali Afshar <aafshar@…>

Children:

1184:dcd452686e90, 1205:d23edbcf8747

Message:

Set correct controlling terminal on VC commands. Patch from GC Birzan. lp:154107

Files:

• pida/services/commander/commander.py (modified) (3 diffs)

pida/services/commander/commander.py

@@ -22 +22 @@
 
 import os, subprocess
+import pty
 
 import gtk, gobject
@@ -284 +285 @@
             self._vte_fork(commandargs, env, cwd) 
 
-    def _python_fork_waiter(self, popen):
-        exit_code = popen.wait()
+    def _python_fork_waiter(self, pid):
+        stupid, exit_code = os.waitpid(pid, 0)
         return exit_code
 
@@ -299 +300 @@
         env = dict(os.environ)
         env['TERM'] = 'xterm'
-        (master, slave) = os.openpty()
-        self.slave = slave
-        self.master = master
-        self._term.set_pty(master)
-        p = subprocess.Popen(commandargs, stdin=slave, stdout=slave,
-                             preexec_fn=self._python_fork_preexec_fn,
-                             stderr=slave, env=env, cwd=cwd, close_fds=True)
-        self._pid = p.pid
-        t = AsyncTask(self._python_fork_waiter, self._python_fork_complete)
-        t.start(p)
+        pid, fd = pty.fork()
+        if pid:
+            self._term.set_pty(fd)
+            self._pid = pid
+            t = AsyncTask(self._python_fork_waiter, self._python_fork_complete)
+            t.start(pid)
+        else:
+            self._python_fork_preexec_fn()
+            os.chdir(cwd)
+            os.execvpe(commandargs[0], commandargs, env)
 
     def _python_fork_parse(self, commandargs, env, cwd, parser_func):