diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-03-03 11:24:11 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-03-03 11:24:11 +0000 |
| commit | 4e088061d60d95e9e55cd2e1b51e285f67e0e56b (patch) | |
| tree | c8380a26fcbd9e7abaeebae512f5b0443fb313bf | |
| parent | dc7a954bd21b04f711daa3a9380117c25d52ba1c (diff) | |
| download | portage-4e088061d60d95e9e55cd2e1b51e285f67e0e56b.tar.gz portage-4e088061d60d95e9e55cd2e1b51e285f67e0e56b.tar.bz2 portage-4e088061d60d95e9e55cd2e1b51e285f67e0e56b.zip | |
Make sure that excess "nomerge" nodes are pruned correctly.
svn path=/main/trunk/; revision=6148
| -rw-r--r-- | pym/emerge/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 \ |