Make sure that excess "nomerge" nodes are pruned correctly.

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

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 7c486601d753c01d8ed7577de15c971c4e52319e..e6b5428356e65e172ec819b1c9ebf5ee0195279c 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -2392,7 +2392,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 \