From 4936d1855919422edd84ce7f90c6c763c6871ec2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 23 Nov 2008 00:30:55 +0000 Subject: 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 for reporting. svn path=/main/trunk/; revision=12045 --- pym/_emerge/__init__.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pym') diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index fe810ab78..1dd0575d8 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -5404,13 +5404,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)))) -- cgit v1.2.3-1-g7c22