From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 17 Mar 2011 01:42:59 +0000 (-0700)
Subject: CompositeTask: fix assertion in _wait
X-Git-Tag: v2.2.0_alpha28~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=947f4bdcd0303a0170d9e1bac3d0964f747ce36b;p=portage.git

CompositeTask: fix assertion in _wait
---

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.