diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-03-16 18:42:59 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-03-18 12:48:03 -0700 |
| commit | cd01cd70242e7fc9c2d52375948bbe76378f1471 (patch) | |
| tree | ffa5000e475956078c4ad7069483f45fecadbe3c /pym | |
| parent | 0df535d2f3115901a429930b90ff1fbc2b04df9e (diff) | |
| download | portage-cd01cd70242e7fc9c2d52375948bbe76378f1471.tar.gz portage-cd01cd70242e7fc9c2d52375948bbe76378f1471.tar.bz2 portage-cd01cd70242e7fc9c2d52375948bbe76378f1471.zip | |
CompositeTask: fix assertion in _wait
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/_emerge/CompositeTask.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pym/_emerge/CompositeTask.py b/pym/_emerge/CompositeTask.py index 4667b7813..b5e8ce5bb 100644 --- a/pym/_emerge/CompositeTask.py +++ b/pym/_emerge/CompositeTask.py @@ -49,6 +49,11 @@ class CompositeTask(AsynchronousTask): # don't wait for the same task more than once break if task is prev: + if self.returncode is not None: + # This is expected if we're being + # called from the task's exit listener + # after it's been cancelled. + break # Before the task.wait() method returned, an exit # listener should have set self._current_task to either # a different task or None. Something is wrong. |