In depgraph._serialize_tasks(), filter "nomerge" nodes at a more appropriate

place. (trunk r10098)

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

diff --git a/bin/emerge b/bin/emerge
index af42ebfa54491f9a54d642b95c12797309f18687..9e3226548bb6125e40e821f3300c77a770d7f702 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -3940,6 +3940,9 @@ class depgraph(object):
                        mygraph.difference_update(selected_nodes)
 
                        for node in selected_nodes:
+                               if isinstance(node, Package) and \
+                                       node.operation == "nomerge":
+                                       continue
 
                                # Handle interactions between blockers
                                # and uninstallation tasks.
@@ -3973,8 +3976,7 @@ class depgraph(object):
                                                        myblocker_uninstalls.remove(blocker)
                                                        solved_blockers.add(blocker)
 
-                               if node[-1] != "nomerge":
-                                       retlist.append(node)
+                               retlist.append(node)
 
                                if isinstance(node, Package) and \
                                        "uninstall" == node.operation: