Let Popen handle multiplexing

1 files changed, 6 insertions, 18 deletions

diff --git a/exts/pip.to_lorry b/exts/pip.to_lorry
index d537851..1027459 100755
--- a/exts/pip.to_lorry
+++ b/exts/pip.to_lorry
@@ -50,31 +50,19 @@ def find_repo_type(url):
         tempdir = tempfile.mkdtemp()
 
         p = subprocess.Popen([vcs, vcs_command, url], stdout=subprocess.PIPE,
-                             stderr=subprocess.PIPE, stdin=subprocess.PIPE,
+                             stderr=subprocess.STDOUT, stdin=subprocess.PIPE,
                              cwd=tempdir)
 
         # We close stdin on parent side to prevent the child from blocking
         # if it reads on stdin
         p.stdin.close()
 
-        poll = select.poll()
+        while True:
+            line = p.stdout.readline()
+            if line == '':
+                break
 
-        fdmap = {p.stdout.fileno(): p.stdout, p.stderr.fileno(): p.stderr}
-        poll.register(p.stdout)
-        poll.register(p.stderr)
-
-        # Multiplex stdout and stderr
-        # TODO: replace this by setting stderr=stdout
-        while fdmap != {}:
-            fds = poll.poll()
-
-            for (fd, _) in fds:
-                line = fdmap[fd].readline().rstrip()
-                if line == '':
-                    poll.unregister(fd)
-                    del fdmap[fd]
-                else:
-                    logging.debug('%s' % line)
+            logging.debug(line.rstrip())
 
         p.wait()    # even with eof on both streams, we still wait