Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r14452 - main/trunk/pym/portage
Date: Sun, 27 Sep 2009 21:01:51
Message-Id: E1Ms0sP-0004IK-N2@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-09-27 21:01:49 +0000 (Sun, 27 Sep 2009)
3 New Revision: 14452
4
5 Modified:
6 main/trunk/pym/portage/__init__.py
7 Log:
8 In _test_pty_eof(), call waitpid on the child process only after reading all
9 the data from the pty.
10
11
12 Modified: main/trunk/pym/portage/__init__.py
13 ===================================================================
14 --- main/trunk/pym/portage/__init__.py 2009-09-27 20:12:29 UTC (rev 14451)
15 +++ main/trunk/pym/portage/__init__.py 2009-09-27 21:01:49 UTC (rev 14452)
16 @@ -3779,7 +3779,6 @@
17 os._exit(os.EX_OK)
18 else:
19 slave_file.close()
20 - os.waitpid(pid, 0)
21
22 eof = False
23 data = []
24 @@ -3809,6 +3808,7 @@
25 data.append(_unicode_decode(buf.tostring(),
26 encoding='utf_8', errors='strict'))
27
28 + os.waitpid(pid, 0)
29 master_file.close()
30
31 return test_string == ''.join(data)