summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-12-26 20:49:57 +0000
committerZac Medico <zmedico@gentoo.org>2008-12-26 20:49:57 +0000
commitf903769489e1d0f1c54acf62f13e4d72e1fc0473 (patch)
treeb7d02eeea8407843464edff89d996effbf6fec61
parent1b2d93df00e557b48daf3add93c0d6ec0c04c640 (diff)
downloadportage-f903769489e1d0f1c54acf62f13e4d72e1fc0473.tar.gz
portage-f903769489e1d0f1c54acf62f13e4d72e1fc0473.tar.bz2
portage-f903769489e1d0f1c54acf62f13e4d72e1fc0473.zip
Fix loop logic some more for bug #252572.
svn path=/main/trunk/; revision=12349
-rw-r--r--pym/_emerge/__init__.py14
1 files changed, 8 insertions, 6 deletions
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