From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 3 Mar 2007 11:24:41 +0000 (-0000)
Subject: Make sure that excess "nomerge" nodes are pruned correctly. (trunk r6147:6148)
X-Git-Tag: v2.1.2.1~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d0844772cd7da64e3d920fcf123d2e54c29101db;p=portage.git

Make sure that excess "nomerge" nodes are pruned correctly. (trunk r6147:6148)

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

diff --git a/bin/emerge b/bin/emerge
index 33efdb746..65f9ea8ee 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2389,7 +2389,7 @@ class depgraph:
 				continue
 			if "blocks" == graph_key[0]:
 				continue
-			if graph_key[-1] != "nomerge":
+			if ordered and graph_key[-1] != "nomerge":
 				last_merge_depth = depth
 				continue
 			if depth >= last_merge_depth or \