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

place.

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

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 5062550877b27eef69769070001c924bdfe52ab1..a988c6bac2f5ad5bdd1a8d0a9b23da0f2abc44b6 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -3793,6 +3793,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.
@@ -3826,8 +3829,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: