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

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

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index e38641eedf585edcf6c6caff2e9365194dd6b198..167e112f6b37a6b5352386e08c98ff1d9bb05766 100644 (file)
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -2474,7 +2474,12 @@ class depgraph(object):
                                        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