When displaying parents of unsolved blockers, prefer parents that are not

directly involved in a conflict.

svn path=/main/trunk/; revision=12421

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 6e0d4e49cfa423f12e088a41a7ba062cd0b9fd19..30b49406514252fcb3ee958a44a7d8d2a1182928 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -7264,12 +7264,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: