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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 4f292ea41bc877a116e986ae7ba562329a086839..adb740cd17f5c1baf4ced592a3b969f5246ec452 100644 (file)
--- 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: