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/SubProcess.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/SubProcess.py')
| -rw-r--r-- | pym/_emerge/SubProcess.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pym/_emerge/SubProcess.py b/pym/_emerge/SubProcess.py index fc035d1e4..16c71fe3b 100644 --- a/pym/_emerge/SubProcess.py +++ b/pym/_emerge/SubProcess.py @@ -49,11 +49,7 @@ class SubProcess(AbstractPollTask): if e.errno != errno.ESRCH: raise del e - - self.cancelled = True - if self.pid is not None: - self.wait() - return self.returncode + AbstractPollTask.cancel(self) def isAlive(self): return self.pid is not None and \ |