public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] portage r12421 - main/trunk/pym/_emerge
@ 2009-01-10 23:01 Zac Medico (zmedico)
  0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2009-01-10 23:01 UTC (permalink / raw
  To: gentoo-commits

Author: zmedico
Date: 2009-01-10 23:01:22 +0000 (Sat, 10 Jan 2009)
New Revision: 12421

Modified:
   main/trunk/pym/_emerge/__init__.py
Log:
When displaying parents of unsolved blockers, prefer parents that are not
directly involved in a conflict.


Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py	2009-01-10 22:26:11 UTC (rev 12420)
+++ main/trunk/pym/_emerge/__init__.py	2009-01-10 23:01:22 UTC (rev 12421)
@@ -7264,12 +7264,12 @@
 
 				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:




^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2009-01-10 23:01 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-10 23:01 [gentoo-commits] portage r12421 - main/trunk/pym/_emerge Zac Medico (zmedico)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox