When dropping deps from the resume list, make sure that the loop can't

be infinite. (trunk r10493)

svn path=/main/branches/2.1.2/; revision=10494

diff --git a/bin/emerge b/bin/emerge
index 9d3ac1d786972ced963366d777ff73a90cd1804f..a232565c51ff163edbd159258d08db4c35258c82 100755 (executable)
--- a/bin/emerge
+++ b/bin/emerge
@@ -8312,7 +8312,8 @@ def action_build(settings, trees, mtimedb,
                                                        tuple(task) in unsatisfied_parents:
                                                        continue
                                                pruned_mergelist.append(task)
-                                       if not pruned_mergelist:
+                                       if not pruned_mergelist or \
+                                               len(pruned_mergelist) == len(mergelist):
                                                raise
                                        mergelist[:] = pruned_mergelist
                                        dropped_tasks.update(unsatisfied_parents)