From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 30 Jul 2007 06:31:54 +0000 (-0000)
Subject: Discard "nomerge" nodes to speed up depgraph.altlist() since those nodes aren't used... 
X-Git-Tag: v2.1.2.11~21
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c3df1ddc0925b43e62a2bec6ed848788897a977f;p=portage.git

Discard "nomerge" nodes to speed up depgraph.altlist() since those nodes aren't used and the --tree algorithm does a good job of regenerating them when appropriate. This also fixes the display algorithm so it doesn't falsely detect duplicate edges as much. (branches/2.1.2 r7068)

svn path=/main/branches/2.1.2.9/; revision=7497
---

diff --git a/bin/emerge b/bin/emerge
index 02ee3ea25..201c44db6 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2008,6 +2008,9 @@ class depgraph:
 			self._altlist_cache[reversed] = retlist[:]
 			return retlist
 		mygraph=self.digraph.copy()
+		for node in mygraph.order[:]:
+			if node[-1] == "nomerge":
+				mygraph.remove(node)
 		self._merge_order_bias(mygraph)
 		myblockers = self.blocker_digraph.copy()
 		retlist=[]