diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2020-04-07 21:55:13 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2020-04-07 22:29:47 -0700 |
| commit | 971124a4cf7b0a578b7c8b87134743f8135481b6 (patch) | |
| tree | 055859aca175bf9b0c045bcd5de0543dfaefa034 /lib | |
| parent | Revert "SpawnProcess: make _main cancel pipe_logger when appropriate" (diff) | |
| download | portage-971124a4cf7b0a578b7c8b87134743f8135481b6.tar.gz portage-971124a4cf7b0a578b7c8b87134743f8135481b6.tar.bz2 portage-971124a4cf7b0a578b7c8b87134743f8135481b6.zip | |
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@gentoo.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/_emerge/SpawnProcess.py | 2 |
1 files changed, 1 insertions, 1 deletions
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): |