aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2020-04-07 21:53:39 -0700
committerZac Medico <zmedico@gentoo.org>2020-04-07 22:29:47 -0700
commitf7e36d1e9d468b5a7f502e477ba1971f8334a5d9 (patch)
tree986f7349e271d9f17fc1c4f8e81a12e0365371be /lib/_emerge
parentRevert "CompositeTask: call self.cancel() for _start_task CancelledError" (diff)
downloadportage-f7e36d1e9d468b5a7f502e477ba1971f8334a5d9.tar.gz
portage-f7e36d1e9d468b5a7f502e477ba1971f8334a5d9.tar.bz2
portage-f7e36d1e9d468b5a7f502e477ba1971f8334a5d9.zip
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@gentoo.org>
Diffstat (limited to 'lib/_emerge')
-rw-r--r--lib/_emerge/SpawnProcess.py7
1 files changed, 1 insertions, 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)