From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 10 Jan 2009 23:01:22 +0000 (-0000)
Subject: When displaying parents of unsolved blockers, prefer parents that are not
X-Git-Tag: v2.2_rc21~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=feaaa1b24d1bfd473558d90a6047e869a1616718;p=portage.git

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 6e0d4e49c..30b494065 100644
--- 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: