summaryrefslogtreecommitdiffstats
path: root/bin/emerge
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2007-03-03 23:05:52 +0000
committerZac Medico <zmedico@gentoo.org>2007-03-03 23:05:52 +0000
commit6eea746f3bed4e3ceaef5915e6191b712490ba20 (patch)
tree03196794c1fef2d1019e611a839ad4b9628badbf /bin/emerge
parentc234c25114384adb80f7b795931e16653dddfc82 (diff)
downloadportage-6eea746f3bed4e3ceaef5915e6191b712490ba20.tar.gz
portage-6eea746f3bed4e3ceaef5915e6191b712490ba20.tar.bz2
portage-6eea746f3bed4e3ceaef5915e6191b712490ba20.zip
Only prune duplicate consecutive nodes if they both have depth == 0. (trunk r6157:6158)
svn path=/main/branches/2.1.2/; revision=6159
Diffstat (limited to 'bin/emerge')
-rwxr-xr-xbin/emerge3
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/emerge b/bin/emerge
index 65f9ea8ee..bd0831fd4 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2382,7 +2382,8 @@ class depgraph:
for i in xrange(len(mylist)-1,-1,-1):
graph_key, depth, ordered = mylist[i]
if not ordered and depth == 0 and i > 1 \
- and graph_key == mylist[i-1][0]:
+ and graph_key == mylist[i-1][0] and \
+ mylist[i-1][1] == 0:
# An ordered node got a consecutive duplicate when the tree was
# being filled in.
del mylist[i]