commit: f7e36d1e9d468b5a7f502e477ba1971f8334a5d9 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Wed Apr 8 04:53:39 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=f7e36d1e
Revert "SpawnProcess: cancel pipe_logger after async_start CancelledError" This reverts commit d331f03ab25422e9afc2e752ea8e39c93a4b0bec. Bug: https://bugs.gentoo.org/716636 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> lib/_emerge/SpawnProcess.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/_emerge/SpawnProcess.py b/lib/_emerge/SpawnProcess.py index ab7971ca8..941b56683 100644 --- a/lib/_emerge/SpawnProcess.py +++ b/lib/_emerge/SpawnProcess.py @@ -147,12 +147,7 @@ class SpawnProcess(SubProcess): log_file_path=log_file_path, stdout_fd=stdout_fd) self._registered = True - try: - yield pipe_logger.async_start() - except asyncio.CancelledError: - if pipe_logger.poll() is None: - pipe_logger.cancel() - raise + yield pipe_logger.async_start() self._main_task = asyncio.ensure_future( self._main(pipe_logger), loop=self.scheduler)
