summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Ipsum <richard.ipsum@codethink.co.uk>2014-12-01 17:00:52 +0000
committerRichard Ipsum <richard.ipsum@codethink.co.uk>2014-12-01 17:00:52 +0000
commit6d9a0e0c407ac463c9921916bb3521541743e67b (patch)
tree4ac96c3c47be4e5310d4ddb93757ff23289d4fd4
parentb98a46c952944a6d0d961c7af0b2815999c3ca3a (diff)
downloadimport-6d9a0e0c407ac463c9921916bb3521541743e67b.tar.gz
Revert "catch interrupt"
This reverts commit b98a46c952944a6d0d961c7af0b2815999c3ca3a.
-rwxr-xr-xexts/pip.find_deps15
1 files changed, 5 insertions, 10 deletions
diff --git a/exts/pip.find_deps b/exts/pip.find_deps
index cb51ccb..30ef507 100755
--- a/exts/pip.find_deps
+++ b/exts/pip.find_deps
@@ -257,19 +257,14 @@ def find_runtime_deps(source, name, version=None):
# if it reads on stdin
p.stdin.close()
- try:
- while True:
- line = p.stdout.readline()
- if line == '':
- break
-
- p.wait() # even with eof on both streams, we still wait
- except KeyboardInterrupt:
- logging.debug('exception! (KeyboardInterrupt)')
- p.terminate() # send SIGTERM to child
+ while True:
+ line = p.stdout.readline()
+ if line == '':
+ break
logging.debug(line.rstrip())
+ p.wait() # even with eof on both streams, we still wait
logging.debug('pip exited with code: %d' % p.returncode)