diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-06-28 02:48:27 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-06-28 02:48:27 +0000 |
commit | 06780db71fde5fecee9243660ffa484d17750bdf (patch) | |
tree | 1bb53e9bd07a365248e09da8931f747de5c24476 | |
parent | e518bcab9ec8e236b333bd6ade79715b335f50e7 (diff) | |
download | portage-06780db71fde5fecee9243660ffa484d17750bdf.tar.gz portage-06780db71fde5fecee9243660ffa484d17750bdf.tar.bz2 portage-06780db71fde5fecee9243660ffa484d17750bdf.zip |
When filling in "nomerge" nodes for --tree display, stop at a node that is an argument or a direct member of a set that has been specified as an argument (system or world). (trunk r7071)
svn path=/main/branches/2.1.2/; revision=7072
-rwxr-xr-x | bin/emerge | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge index d9bde5e11..443f5d7e0 100755 --- 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 |