diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2011-03-16 18:19:02 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-03-16 18:19:02 -0700 |
| commit | 19121602b455da19a2c9a4199362f13444709dc7 (patch) | |
| tree | 06586f9801099e20229a27f3bdb9e6d26cd1a566 /pym/_emerge/CompositeTask.py | |
| parent | Scheduler: terminate _merge_wait_queue (diff) | |
| download | portage-19121602b455da19a2c9a4199362f13444709dc7.tar.gz portage-19121602b455da19a2c9a4199362f13444709dc7.tar.bz2 portage-19121602b455da19a2c9a4199362f13444709dc7.zip | |
AsynchronousTask: always call wait() if cancelled
This is needed in order to ensure that exit listeners are called.
Subclasses call the base class cancel() method in order to inherit the
wait() call.
Diffstat (limited to 'pym/_emerge/CompositeTask.py')
| -rw-r--r-- | pym/_emerge/CompositeTask.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/CompositeTask.py b/pym/_emerge/CompositeTask.py index ddbfe6364..4667b7813 100644 --- a/pym/_emerge/CompositeTask.py +++ b/pym/_emerge/CompositeTask.py @@ -1,4 +1,4 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from _emerge.AsynchronousTask import AsynchronousTask @@ -15,6 +15,7 @@ class CompositeTask(AsynchronousTask): self.cancelled = True if self._current_task is not None: self._current_task.cancel() + AsynchronousTask.cancel(self) def _poll(self): """ |