When dropping deps from the resume list, make sure that the loop can't
authorZac Medico <zmedico@gentoo.org>
Thu, 29 May 2008 23:40:58 +0000 (23:40 -0000)
committerZac Medico <zmedico@gentoo.org>
Thu, 29 May 2008 23:40:58 +0000 (23:40 -0000)
be infinite.

svn path=/main/trunk/; revision=10493

pym/_emerge/__init__.py

index 7aaefbf2bc7361ecda2e26bd1ac4733fa6718225..c315af65d61696698114acd5a4a7cb1a99242487 100644 (file)
@@ -8381,7 +8381,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)