summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-09-27 21:01:49 +0000
committerZac Medico <zmedico@gentoo.org>2009-09-27 21:01:49 +0000
commit8da67a5dd3eea67ac10f4c5b24ca73aec19d27ae (patch)
treeff9f70c292c0fb2c7a42335fef54a110fa8ffdeb
parent86a164d83b36a283d0837afb383d30f6f2a7caae (diff)
downloadportage-8da67a5dd3eea67ac10f4c5b24ca73aec19d27ae.tar.gz
portage-8da67a5dd3eea67ac10f4c5b24ca73aec19d27ae.tar.bz2
portage-8da67a5dd3eea67ac10f4c5b24ca73aec19d27ae.zip
In _test_pty_eof(), call waitpid on the child process only after reading all
the data from the pty. svn path=/main/trunk/; revision=14452
-rw-r--r--pym/portage/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 3bc125b94..b00047027 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3779,7 +3779,6 @@ def _test_pty_eof():
os._exit(os.EX_OK)
else:
slave_file.close()
- os.waitpid(pid, 0)
eof = False
data = []
@@ -3809,6 +3808,7 @@ def _test_pty_eof():
data.append(_unicode_decode(buf.tostring(),
encoding='utf_8', errors='strict'))
+ os.waitpid(pid, 0)
master_file.close()
return test_string == ''.join(data)