diff options
author | Zac Medico <zmedico@gentoo.org> | 2018-04-26 01:09:08 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2018-04-26 01:39:19 -0700 |
commit | 9b93296e14e2e7f52cd2bf4d626eb7387f6786ab (patch) | |
tree | a8f58e329775576665c568ea666e25ca759a6753 | |
parent | AsyncScheduler._poll(): fix event loop recursion (bug 591760) (diff) | |
download | portage-9b93296e.tar.gz portage-9b93296e.tar.bz2 portage-9b93296e.zip |
CompositeTask._cancel(): use _async_wait() (bug 591760)
After setting the returncode due to the current task being
queued, use _async_wait() for consistency with the case
where the current task needs to be cancelled, so that either
case ultimately results in notification of exit listeners.
Bug: https://bugs.gentoo.org/591760
-rw-r--r-- | pym/_emerge/CompositeTask.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/pym/_emerge/CompositeTask.py b/pym/_emerge/CompositeTask.py index bfd4bacbd..113e5935f 100644 --- a/pym/_emerge/CompositeTask.py +++ b/pym/_emerge/CompositeTask.py @@ -18,6 +18,7 @@ class CompositeTask(AsynchronousTask): if self._current_task is self._TASK_QUEUED: self.returncode = 1 self._current_task = None + self._async_wait() else: self._current_task.cancel() |