From 6eb6500435c80837f106d3f9f9f6bb246ff00c16 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 29 Feb 2020 13:43:29 -0800 Subject: [PATCH] SpawnProcess: make _main cancel pipe_logger when appropriate Signed-off-by: Zac Medico --- lib/_emerge/SpawnProcess.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/_emerge/SpawnProcess.py b/lib/_emerge/SpawnProcess.py index aef000e22d..941b56683b 100644 --- a/lib/_emerge/SpawnProcess.py +++ b/lib/_emerge/SpawnProcess.py @@ -155,8 +155,13 @@ def _async_start(self): @coroutine def _main(self, pipe_logger): - if pipe_logger.poll() is None: - yield pipe_logger.async_wait() + 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 def _main_exit(self, main_task): try: