From 2e568bbebd56a22fc2d09fa2e5f84343cd401c6a Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 27 Dec 2008 18:27:19 +0000 Subject: Fix loop logic some more for bug #252572. (trunk r12349) svn path=/main/branches/2.1.6/; revision=12354 --- pym/_emerge/__init__.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index ba4c848d9..1788f2c71 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -6991,15 +6991,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 -- cgit v1.2.3-1-g7c22