aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2020-04-07 21:53:06 -0700
committerZac Medico <zmedico@gentoo.org>2020-04-07 22:29:46 -0700
commit044012ffdbe8e946712fa63da9c03d31d8e1047d (patch)
tree690bc73d4d070dd9cbe481b0580b0d8007e8a29e /lib/_emerge
parentRevert "AsyncScheduler: cancel task after _task_coroutine CancelledError" (diff)
downloadportage-044012ffdbe8e946712fa63da9c03d31d8e1047d.tar.gz
portage-044012ffdbe8e946712fa63da9c03d31d8e1047d.tar.bz2
portage-044012ffdbe8e946712fa63da9c03d31d8e1047d.zip
Revert "CompositeTask: call self.cancel() for _start_task CancelledError"
This reverts commit 1c681e0cc783ca241b1f2e1c782fccd8f1aac769. Bug: https://bugs.gentoo.org/716636 Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'lib/_emerge')
-rw-r--r--lib/_emerge/CompositeTask.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/_emerge/CompositeTask.py b/lib/_emerge/CompositeTask.py
index 2ad1d783d..21129758a 100644
--- a/lib/_emerge/CompositeTask.py
+++ b/lib/_emerge/CompositeTask.py
@@ -119,7 +119,7 @@ class CompositeTask(AsynchronousTask):
try:
future.result()
except asyncio.CancelledError:
- self.cancel()
+ self.cancelled = True
self._was_cancelled()
self._async_wait()