From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 9 Dec 2006 23:34:43 +0000 (-0000)
Subject: Don't attempt to enforce merge order unless the blocker parent is actually a "merge... 
X-Git-Tag: v2.1.2~338
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e160100049ae52dbca16eab8582da865d27b94ad;p=portage.git

Don't attempt to enforce merge order unless the blocker parent is actually a "merge" node.

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

diff --git a/bin/emerge b/bin/emerge
index 9970ad0e8..c022fb487 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1471,7 +1471,8 @@ class depgraph:
 						# node matters.  In any case, this particular block is
 						# automatically resolved.
 						continue
-					if slot_atom not in blocked_slots_final.values():
+					if pstatus == "merge" and
+						slot_atom not in blocked_slots_final.values():
 						upgrade_matches = final_db.match(slot_atom)
 						if upgrade_matches:
 							# Apparently an upgrade may be able to invalidate