summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-06-28 02:48:02 +0000
committerZac Medico <zmedico@gentoo.org>2007-06-28 02:48:02 +0000
commit70157707e40df875c0cdba519dc84b66fa603219 (patch)
tree752a555f55783631bba2cc26f5bc96b6579841bc /pym
parentc21c610b9176d1f6d3fc8ada5d1a1aed0da8135a (diff)
downloadportage-70157707e40df875c0cdba519dc84b66fa603219.tar.gz
portage-70157707e40df875c0cdba519dc84b66fa603219.tar.bz2
portage-70157707e40df875c0cdba519dc84b66fa603219.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).
svn path=/main/trunk/; revision=7071
Diffstat (limited to 'pym')
-rw-r--r--pym/emerge/__init__.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index e38641eed..167e112f6 100644
--- 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