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/FifoIpcDaemon.py | |
| parent | 282263a511d13b62e3c4d0636011f486b1eeb588 (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/FifoIpcDaemon.py')
| -rw-r--r-- | pym/_emerge/FifoIpcDaemon.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/_emerge/FifoIpcDaemon.py b/pym/_emerge/FifoIpcDaemon.py index ac83646b9..c31508a83 100644 --- a/pym/_emerge/FifoIpcDaemon.py +++ b/pym/_emerge/FifoIpcDaemon.py @@ -1,4 +1,4 @@ -# Copyright 2010 Gentoo Foundation +# Copyright 2010-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from portage import os @@ -48,7 +48,7 @@ class FifoIpcDaemon(AbstractPollTask): self.returncode = 1 self.cancelled = True self._unregister() - self.wait() + AbstractPollTask.cancel(self) def _wait(self): if self.returncode is not None: |