From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 12 Feb 2007 07:11:06 +0000 (-0000)
Subject: In the event of a circular dependency panic, eliminate root nodes in order to reduce... 
X-Git-Tag: v2.1.2.1~74
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=eb537b378cff012d58bdb3f16eb9de4fff1a8bf9;p=portage.git

In the event of a circular dependency panic, eliminate root nodes in order to reduce the noise level to a minimum. (trunk r5956)

svn path=/main/branches/2.1.2/; revision=5957
---

diff --git a/bin/emerge b/bin/emerge
index a4888188a..06e9b9eb2 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2054,6 +2054,15 @@ class depgraph:
 					self.altlist()
 				print "!!! Error: circular dependencies:"
 				print
+				# Reduce the noise level to a minimum via elimination of root
+				# nodes.
+				while True:
+					root_nodes = mygraph.root_nodes(
+						ignore_priority=DepPriority.SOFT)
+					if not root_nodes:
+						break
+					for node in root_nodes:
+						mygraph.remove(node)
 				mygraph.debug_print()
 				sys.exit(1)