In _test_pty_eof(), call waitpid on the child process only after reading all
authorZac Medico <zmedico@gentoo.org>
Sun, 27 Sep 2009 21:01:49 +0000 (21:01 -0000)
committerZac Medico <zmedico@gentoo.org>
Sun, 27 Sep 2009 21:01:49 +0000 (21:01 -0000)
the data from the pty.

svn path=/main/trunk/; revision=14452

pym/portage/__init__.py

index 3bc125b94f1cdfd01167a2447df72b7d4c240548..b00047027819bf0b061991f5d2da422382325b9f 100644 (file)
@@ -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)