Only prune duplicate consecutive nodes if they both have depth == 0. (trunk r6157...
authorZac Medico <zmedico@gentoo.org>
Sat, 3 Mar 2007 23:05:52 +0000 (23:05 -0000)
committerZac Medico <zmedico@gentoo.org>
Sat, 3 Mar 2007 23:05:52 +0000 (23:05 -0000)
svn path=/main/branches/2.1.2/; revision=6159

bin/emerge

index 65f9ea8ee2dfc09271eea2132b58215d817392cd..bd0831fd4bc30ce05f86642141de00c030eaaaa2 100755 (executable)
@@ -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]