diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-03-03 11:24:41 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-03 11:24:41 +0000 |
| commit | d0844772cd7da64e3d920fcf123d2e54c29101db (patch) | |
| tree | eee4025cda61676f79cc989ce30a225fec70016f | |
| parent | Add missing sys import. (trunk r6145:6146) (diff) | |
| download | portage-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-x | bin/emerge | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 \ |