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

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

diff --git a/bin/emerge b/bin/emerge
index 9970ad0e8da19697305c1ec098eb4655865bd550..c022fb4875c385be45530f01fd7edc4901166ee3 100755 (executable)
--- 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