summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-03-03 11:24:41 +0000
committerZac Medico <zmedico@gentoo.org>2007-03-03 11:24:41 +0000
commitd0844772cd7da64e3d920fcf123d2e54c29101db (patch)
treeeee4025cda61676f79cc989ce30a225fec70016f
parentAdd missing sys import. (trunk r6145:6146) (diff)
downloadportage-multirepo-d0844772cd7da64e3d920fcf123d2e54c29101db.tar.gz
portage-multirepo-d0844772cd7da64e3d920fcf123d2e54c29101db.tar.bz2
portage-multirepo-d0844772cd7da64e3d920fcf123d2e54c29101db.zip
Make sure that excess "nomerge" nodes are pruned correctly. (trunk r6147:6148)
svn path=/main/branches/2.1.2/; revision=6149
-rwxr-xr-xbin/emerge2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge
index 33efdb74..65f9ea8e 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 \