commit: 971124a4cf7b0a578b7c8b87134743f8135481b6 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Wed Apr 8 04:55:13 2020 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Wed Apr 8 05:29:47 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=971124a4
Revert "SpawnProcess: only cancel self._main_task if it's not done" This reverts commit 10cc6febb701cde8f7c099f5ecdf177486e94b3c. Bug: https://bugs.gentoo.org/716636 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> lib/_emerge/SpawnProcess.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/_emerge/SpawnProcess.py b/lib/_emerge/SpawnProcess.py index aef000e22..cda615ded 100644 --- a/lib/_emerge/SpawnProcess.py +++ b/lib/_emerge/SpawnProcess.py @@ -196,7 +196,7 @@ class SpawnProcess(SubProcess): def _cancel(self): SubProcess._cancel(self) if self._main_task is not None: - self._main_task.done() or self._main_task.cancel() + self._main_task.cancel() self._cgroup_cleanup() def _cgroup_cleanup(self):
