summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-04-10 01:06:43 +0000
committerGerrit Code Review <review@openstack.org>2014-04-10 01:06:43 +0000
commit0e0ae1dcf7043079d3c75006556255e5f127ec13 (patch)
treec6becdc9a440e65788a674df4f790f08d108047a
parent90aba4bbe778dbb3085446b3248da4216b968adf (diff)
parent6ad492cf575b38dffe4283e3314499b7518055fe (diff)
downloadturbo-hipster-0e0ae1dcf7043079d3c75006556255e5f127ec13.tar.gz
Merge "Stop trying to close the open process"
-rw-r--r--turbo_hipster/lib/utils.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/turbo_hipster/lib/utils.py b/turbo_hipster/lib/utils.py
index fa295af..f0603af 100644
--- a/turbo_hipster/lib/utils.py
+++ b/turbo_hipster/lib/utils.py
@@ -186,6 +186,9 @@ def execute_to_log(cmd, logfile, timeout=-1,
# Clean up
for fd, descriptor in descriptors.items():
poll_obj.unregister(fd)
+ if fd == p.stdout.fileno():
+ # Don't try and close the process, it'll clean itself up
+ continue
os.close(fd)
try:
p.kill()