When filling in "nomerge" nodes for --tree display, stop at a node that is an argumen...

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

diff --git a/bin/emerge b/bin/emerge
index d9bde5e11bcc9339c765f9c371e73e5b47fac707..443f5d7e0f51974cea7ebffb28669a7ca56f572f 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -2443,7 +2443,12 @@ class depgraph:
                                        traversed_nodes = set() # prevent endless circles
                                        traversed_nodes.add(graph_key)
                                        def add_parents(current_node, ordered):
-                                               parent_nodes = mygraph.parent_nodes(current_node)
+                                               parent_nodes = None
+                                               # Do not traverse to parents if this node is an
+                                               # an argument or a direct member of a set that has
+                                               # been specified as an argument (system or world).
+                                               if current_node not in self._args_nodes:
+                                                       parent_nodes = mygraph.parent_nodes(current_node)
                                                if parent_nodes:
                                                        child_nodes = set(mygraph.child_nodes(current_node))
                                                        selected_parent = None