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

Make sure that excess "nomerge" nodes are pruned correctly.

svn path=/main/trunk/; revision=6148
---

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 7c486601d..e6b542835 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -2392,7 +2392,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 \