From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 26 Dec 2008 20:49:57 +0000 (-0000)
Subject: Fix loop logic some more for bug #252572.
X-Git-Tag: v2.2_rc20~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f903769489e1d0f1c54acf62f13e4d72e1fc0473;p=portage.git

Fix loop logic some more for bug #252572.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index e34f7ab35..880d9cbcc 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -7007,15 +7007,17 @@ class depgraph(object):
 						except KeyError:
 							pass
 						else:
+							uninst_task = node
 							ignored_uninstall_tasks.add(node)
 							break
 
-				# After dropping an Uninstall task, reset
-				# the state variables for leaf node selection and
-				# continue trying to select leaf nodes.
-				prefer_asap = True
-				accept_root_node = False
-				continue
+				if uninst_task is not None:
+					# After dropping an Uninstall task, reset
+					# the state variables for leaf node selection and
+					# continue trying to select leaf nodes.
+					prefer_asap = True
+					accept_root_node = False
+					continue
 
 			if not selected_nodes:
 				self._circular_deps_for_display = mygraph