From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 27 Sep 2009 21:01:49 +0000 (-0000)
Subject: In _test_pty_eof(), call waitpid on the child process only after reading all
X-Git-Tag: v2.2_rc43~24
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8da67a5dd3eea67ac10f4c5b24ca73aec19d27ae;p=portage.git

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
---

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)