From e160100049ae52dbca16eab8582da865d27b94ad Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 9 Dec 2006 23:34:43 +0000 Subject: Don't attempt to enforce merge order unless the blocker parent is actually a "merge" node. svn path=/main/trunk/; revision=5246 --- bin/emerge | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3-1-g7c22