Make sure that excess "nomerge" nodes are pruned correctly. (trunk r6147:6148)

svn path=/main/branches/2.1.2/; revision=6149

diff --git a/bin/emerge b/bin/emerge
index 33efdb746352d590202c15dcbda7ead45c2f4a02..65f9ea8ee2dfc09271eea2132b58215d817392cd 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2389,7 +2389,7 @@ class depgraph:
                                continue
                        if "blocks" == graph_key[0]:
                                continue
-                       if graph_key[-1] != "nomerge":
+                       if ordered and graph_key[-1] != "nomerge":
                                last_merge_depth = depth
                                continue
                        if depth >= last_merge_depth or \