Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:prefix commit in: pym/_emerge/
Date: Sat, 05 Feb 2011 20:51:24
Message-Id: 4d6d55b00d1e08453397c37f6b986c60175fd30f.grobian@gentoo
1 commit: 4d6d55b00d1e08453397c37f6b986c60175fd30f
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 5 03:20:37 2011 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 5 03:20:37 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=4d6d55b0
7
8 get_dep_chain: add "set" node type
9
10 ---
11 pym/_emerge/depgraph.py | 7 +++++--
12 1 files changed, 5 insertions(+), 2 deletions(-)
13
14 diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
15 index f131889..6e8ca31 100644
16 --- a/pym/_emerge/depgraph.py
17 +++ b/pym/_emerge/depgraph.py
18 @@ -2199,7 +2199,11 @@ class depgraph(object):
19 traversed_nodes.add(node)
20
21 if isinstance(node, DependencyArg):
22 - dep_chain.append((_unicode_decode("%s") % (node,), "argument"))
23 + if self._dynamic_config.digraph.parent_nodes(node):
24 + node_type = "set"
25 + else:
26 + node_type = "argument"
27 + dep_chain.append((_unicode_decode("%s") % (node,), node_type))
28
29 elif node is not start_node:
30 for ppkg, patom in all_parents[child]:
31 @@ -2650,7 +2654,6 @@ class depgraph(object):
32 # It's redundant to show parent for AtomArg since
33 # it's the same as 'xinfo' displayed above.
34 dep_chain = self._get_dep_chain(myparent, atom)
35 -
36 for node, node_type in dep_chain:
37 msg.append('(dependency required by "%s" [%s])' % \
38 (colorize('INFORM', _unicode_decode("%s") % \