summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-01-10 23:01:22 +0000
committerZac Medico <zmedico@gentoo.org>2009-01-10 23:01:22 +0000
commitfeaaa1b24d1bfd473558d90a6047e869a1616718 (patch)
treeef79d43883c47b6b0b71ab612bb3ff53e981b8d7
parentWhen displaying parents of unsolved blockers, reduce noise by pruning packages (diff)
downloadportage-multirepo-feaaa1b24d1bfd473558d90a6047e869a1616718.tar.gz
portage-multirepo-feaaa1b24d1bfd473558d90a6047e869a1616718.tar.bz2
portage-multirepo-feaaa1b24d1bfd473558d90a6047e869a1616718.zip
When displaying parents of unsolved blockers, prefer parents that are not
directly involved in a conflict. svn path=/main/trunk/; revision=12421
-rw-r--r--pym/_emerge/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 6e0d4e49..30b49406 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: