diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-12-27 18:27:19 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-12-27 18:27:19 +0000 |
| commit | 2e568bbebd56a22fc2d09fa2e5f84343cd401c6a (patch) | |
| tree | 29538bee21a913de4e313c6dc40a8d09b1c6b3ea /pym/_emerge | |
| parent | 5d3cd320c07355c18b8cbc192d0a07859d874f2b (diff) | |
| download | portage-2e568bbebd56a22fc2d09fa2e5f84343cd401c6a.tar.gz portage-2e568bbebd56a22fc2d09fa2e5f84343cd401c6a.tar.bz2 portage-2e568bbebd56a22fc2d09fa2e5f84343cd401c6a.zip | |
Fix loop logic some more for bug #252572. (trunk r12349)
svn path=/main/branches/2.1.6/; revision=12354
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 14 |
1 files changed, 8 insertions, 6 deletions
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 |