| 1 |
commit: f7b1b61f682f3d635aaded630d8e61f1756c8023 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 26 06:12:19 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 26 06:13:57 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f7b1b61f |
| 7 |
|
| 8 |
PipeReader._output_handler: use _async_wait() (bug 591760) |
| 9 |
|
| 10 |
Use _async_wait() to avoid event loop recursion. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/591760 |
| 13 |
|
| 14 |
pym/_emerge/PipeReader.py | 5 +++-- |
| 15 |
1 file changed, 3 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py |
| 18 |
index a8392c329..b8e61834c 100644 |
| 19 |
--- a/pym/_emerge/PipeReader.py |
| 20 |
+++ b/pym/_emerge/PipeReader.py |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2013 Gentoo Foundation |
| 23 |
+# Copyright 1999-2018 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
import fcntl |
| 27 |
@@ -77,7 +77,8 @@ class PipeReader(AbstractPollTask): |
| 28 |
self._read_data.append(data) |
| 29 |
else: |
| 30 |
self._unregister() |
| 31 |
- self.wait() |
| 32 |
+ self.returncode = self.returncode or os.EX_OK |
| 33 |
+ self._async_wait() |
| 34 |
break |
| 35 |
|
| 36 |
self._unregister_if_appropriate(event) |
Archives