Put version control output into log

1 files changed, 25 insertions, 2 deletions

diff --git a/exts/pip.to_lorry b/exts/pip.to_lorry
index 8a36ac8..be207f7 100755
--- a/exts/pip.to_lorry
+++ b/exts/pip.to_lorry
@@ -27,6 +27,7 @@ import shutil
 import tempfile
 import xmlrpclib
 import logging
+import select
 
 import pkg_resources
 
@@ -49,9 +50,31 @@ def find_repo_type(url):
         tempdir = tempfile.mkdtemp()
 
         p = subprocess.Popen([vcs, vcs_command, url], stdout=subprocess.PIPE,
-                             stderr=subprocess.PIPE, cwd=tempdir)
+                             stderr=subprocess.PIPE, 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()
+
+        fdmap = {p.stdout.fileno(): p.stdout, p.stderr.fileno(): p.stderr}
+        poll.register(p.stdout)
+        poll.register(p.stderr)
+
+        # Multiplex stdout and stderr
+        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)
 
-        _, _ = p.communicate()
         shutil.rmtree(tempdir)
 
         if p.returncode == 0: