commit: 7e2918896d8dd84e07082bba734d3ce8429ba36d Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Wed Apr 8 04:54:27 2020 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Wed Apr 8 05:29:47 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=7e291889
Revert "SpawnProcess: make _main cancel pipe_logger when appropriate" This reverts commit 6eb6500435c80837f106d3f9f9f6bb246ff00c16. Bug: https://bugs.gentoo.org/716636 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> lib/_emerge/SpawnProcess.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/_emerge/SpawnProcess.py b/lib/_emerge/SpawnProcess.py index 941b56683..aef000e22 100644 --- a/lib/_emerge/SpawnProcess.py +++ b/lib/_emerge/SpawnProcess.py @@ -155,13 +155,8 @@ class SpawnProcess(SubProcess): @coroutine def _main(self, pipe_logger): - try: - if pipe_logger.poll() is None: - yield pipe_logger.async_wait() - except asyncio.CancelledError: - if pipe_logger.poll() is None: - pipe_logger.cancel() - raise + if pipe_logger.poll() is None: + yield pipe_logger.async_wait() def _main_exit(self, main_task): try:
