From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 8 Jul 2008 16:59:40 +0000 (-0000)
Subject: Fix infinite loop in CompositeTask._wait().
X-Git-Tag: v2.2_rc2~155
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=572fc99bdcd57c911c60f767688f597a23cbe2ef;p=portage.git

Fix infinite loop in CompositeTask._wait().

svn path=/main/trunk/; revision=10986
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index d7cd8fa11..f0a0a687c 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1579,11 +1579,14 @@ class CompositeTask(AsynchronousTask):
 
 	def _wait(self):
 
+		prev = None
 		while True:
 			task = self._current_task
-			if task is None:
+			if task is None or task is prev:
+				# don't wait for the same task more than once
 				break
 			task.wait()
+			prev = task
 
 		return self.returncode