diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2020-04-07 21:54:27 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2020-04-07 22:29:47 -0700 |
| commit | 7e2918896d8dd84e07082bba734d3ce8429ba36d (patch) | |
| tree | d9dc3ffba42ec481a7586cac8088dc8b869f8266 | |
| parent | Revert "SpawnProcess: cancel pipe_logger after async_start CancelledError" (diff) | |
| download | portage-7e2918896d8dd84e07082bba734d3ce8429ba36d.tar.gz portage-7e2918896d8dd84e07082bba734d3ce8429ba36d.tar.bz2 portage-7e2918896d8dd84e07082bba734d3ce8429ba36d.zip | |
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@gentoo.org>
| -rw-r--r-- | lib/_emerge/SpawnProcess.py | 9 |
1 files 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: |