From beca30200c738ac81351353028b29fd826750a1d Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 12 Jan 2009 08:27:48 +0000 Subject: When displaying parents of unsolved blockers, prefer parents that are not directly involved in a conflict. (trunk r12421) svn path=/main/branches/2.1.6/; revision=12477 --- pym/_emerge/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pym') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 4f292ea41..adb740cd1 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -7248,12 +7248,12 @@ class depgraph(object): pruned_list = set() - # Prefer conflict packages over others. + # Prefer packages that are not directly involved in a conflict. for parent_atom in parent_atoms: if len(pruned_list) >= max_parents: break parent, atom = parent_atom - if parent in conflict_pkgs: + if parent not in conflict_pkgs: pruned_list.add(parent_atom) for parent_atom in parent_atoms: -- cgit v1.2.3-1-g7c22