From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 3 Mar 2007 23:05:52 +0000 (-0000)
Subject: Only prune duplicate consecutive nodes if they both have depth == 0. (trunk r6157... 
X-Git-Tag: v2.1.2.1~4
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6eea746f3bed4e3ceaef5915e6191b712490ba20;p=portage.git

Only prune duplicate consecutive nodes if they both have depth == 0. (trunk r6157:6158)

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

diff --git a/bin/emerge b/bin/emerge
index 65f9ea8ee..bd0831fd4 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2382,7 +2382,8 @@ class depgraph:
 		for i in xrange(len(mylist)-1,-1,-1):
 			graph_key, depth, ordered = mylist[i]
 			if not ordered and depth == 0 and i > 1 \
-				and graph_key == mylist[i-1][0]:
+				and graph_key == mylist[i-1][0] and \
+				mylist[i-1][1] == 0:
 				# An ordered node got a consecutive duplicate when the tree was
 				# being filled in.
 				del mylist[i]