commit:     044012ffdbe8e946712fa63da9c03d31d8e1047d
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Apr  8 04:53:06 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Apr  8 05:29:46 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=044012ff

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 <AT> gentoo.org>

 lib/_emerge/CompositeTask.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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()
 

Reply via email to