From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 2 Nov 2007 04:31:28 +0000 (-0000)
Subject: Fix ignore_priority logic in depgraph.altlist() in order
X-Git-Tag: v2.2_pre1~466
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ab89b48e7643ca72d8ac6fcd60463d536eda11c3;p=portage.git

Fix ignore_priority logic in depgraph.altlist() in order
to handle some cases where it was possible for nodes to
be selected without their PDEPENDs being propperly added
to the asap_nodes list.

svn path=/main/trunk/; revision=8360
---

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index d47739438..0eb66250e 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -2810,6 +2810,14 @@ class depgraph(object):
 						if selected_nodes:
 							break
 
+					# If any nodes have been selected here, it's always
+					# possible that anything up to a MEDIUM_SOFT priority
+					# relationship has been ignored. This state is recorded
+					# in ignore_priority so that relevant nodes will be
+					# added to asap_nodes when appropriate.
+					if selected_nodes:
+						ignore_priority = DepPriority.MEDIUM_SOFT
+
 					if prefer_asap and asap_nodes and not selected_nodes:
 						# We failed to find any asap nodes to merge, so ignore
 						# them for the next iteration.