From d0844772cd7da64e3d920fcf123d2e54c29101db Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 3 Mar 2007 11:24:41 +0000 Subject: Make sure that excess "nomerge" nodes are pruned correctly. (trunk r6147:6148) svn path=/main/branches/2.1.2/; revision=6149 --- bin/emerge | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bin/emerge') 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 \ -- cgit v1.2.3-1-g7c22