diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-11-23 00:33:59 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-11-23 00:33:59 +0000 |
| commit | f629df2a2efdf22eb3b0e569fd13a173e2583746 (patch) | |
| tree | 7a594ae921c038df79eb7d967a4ce45abfe0873b | |
| parent | 4f396d0bfdf81f9f790151da80dde0e75e0c20c2 (diff) | |
| download | portage-f629df2a2efdf22eb3b0e569fd13a173e2583746.tar.gz portage-f629df2a2efdf22eb3b0e569fd13a173e2583746.tar.bz2 portage-f629df2a2efdf22eb3b0e569fd13a173e2583746.zip | |
When displaying anscestors of an unstatisfied dependency (code from bug
#245358), avoid a potential infinite loop and memory leak triggered by
circular dependencies. Thanks to Peter Weller <welp@g.o> for reporting.
(trunk r12045)
svn path=/main/branches/2.1.6/; revision=12046
| -rw-r--r-- | pym/_emerge/__init__.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index e8bcd7cd0..c69998e67 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -5388,13 +5388,18 @@ class depgraph(object): print "\nemerge: there are no ebuilds to satisfy "+green(xinfo)+"." # Show parent nodes and the argument that pulled them in. + traversed_nodes = set() node = myparent msg = [] while node is not None: + traversed_nodes.add(node) msg.append('(dependency required by "%s" [%s])' % \ (colorize('INFORM', str(node.cpv)), node.type_name)) parent = None for parent in self.digraph.parent_nodes(node): + if parent in traversed_nodes: + parent = None + continue if isinstance(parent, DependencyArg): msg.append('(dependency required by "%s" [argument])' % \ (colorize('INFORM', str(parent)))) |