From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 3 Mar 2007 11:37:00 +0000 (-0000)
Subject: Merged from trunk -r614{7,8}
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1d1d44935ab2c364dd20c172997021ad11aab8f7;p=portage.git

Merged from trunk -r614{7,8}

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


svn path=/main/branches/prefix/; revision=6151
---

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 2125367aa..4307097b3 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -2393,7 +2393,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 \