Do some small fixes to prevent slot collision nodes from interfering with the depgraph.

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

diff --git a/bin/emerge b/bin/emerge
index 6e7cb55582475b7e0e6cdf6a09c877f148e17791..0666d2a1de37e4bf0a95d079fc2d38812448e2f0 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -1189,8 +1189,14 @@ class depgraph:
                                                ((jbigkey, myparents), (existing_node, e_parents)))
 
                                        # Now add this node to the graph so that self.display()
-                                       # can work with it show use flags and --tree output.
-                                       self.useFlags[myroot][mykey] = myuse
+                                       # can show use flags and --tree output.  This node is
+                                       # only being partially added to the graph.  It must not be
+                                       # allowed to interfere with the other nodes that have been
+                                       # added.  Do not overwrite data for existing nodes in
+                                       # self.pkg_node_map and self.mydbapi since that data will
+                                       # be used for blocker validation.
+                                       self.pkg_node_map[myroot].setdefault(mykey, jbigkey)
+                                       self.useFlags[myroot].setdefault(mykey, myuse)
                                        self._parent_child_digraph.add(jbigkey, myparent)
                                        if rev_dep and myparent:
                                                self.digraph.add(myparent, jbigkey,