| 1 |
commit: 9b93296e14e2e7f52cd2bf4d626eb7387f6786ab |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 26 08:09:08 2018 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 26 08:39:19 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9b93296e |
| 7 |
|
| 8 |
CompositeTask._cancel(): use _async_wait() (bug 591760) |
| 9 |
|
| 10 |
After setting the returncode due to the current task being |
| 11 |
queued, use _async_wait() for consistency with the case |
| 12 |
where the current task needs to be cancelled, so that either |
| 13 |
case ultimately results in notification of exit listeners. |
| 14 |
|
| 15 |
Bug: https://bugs.gentoo.org/591760 |
| 16 |
|
| 17 |
pym/_emerge/CompositeTask.py | 1 + |
| 18 |
1 file changed, 1 insertion(+) |
| 19 |
|
| 20 |
diff --git a/pym/_emerge/CompositeTask.py b/pym/_emerge/CompositeTask.py |
| 21 |
index bfd4bacbd..113e5935f 100644 |
| 22 |
--- a/pym/_emerge/CompositeTask.py |
| 23 |
+++ b/pym/_emerge/CompositeTask.py |
| 24 |
@@ -18,6 +18,7 @@ class CompositeTask(AsynchronousTask): |
| 25 |
if self._current_task is self._TASK_QUEUED: |
| 26 |
self.returncode = 1 |
| 27 |
self._current_task = None |
| 28 |
+ self._async_wait() |
| 29 |
else: |
| 30 |
self._current_task.cancel() |
Archives