Merged from trunk -r614{7,8}

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

svn path=/main/branches/prefix/; revision=6151

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 2125367aa839d44fcc6a76097074a45e4b9aa0a1..4307097b3393d5d231e6fd03f03ba09dc9539376 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -2393,7 +2393,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 \