summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-05-29 23:40:58 +0000
committerZac Medico <zmedico@gentoo.org>2008-05-29 23:40:58 +0000
commit9bd5127bd3f2ab18b71ecbc8a9fa03f2d1b23ed1 (patch)
treee11ccf63973c32b308a8f713f52e2e641168ea46
parent9feae24a4a1bfcb9e83f5e6149f46aae258a062b (diff)
downloadportage-9bd5127bd3f2ab18b71ecbc8a9fa03f2d1b23ed1.tar.gz
portage-9bd5127bd3f2ab18b71ecbc8a9fa03f2d1b23ed1.tar.bz2
portage-9bd5127bd3f2ab18b71ecbc8a9fa03f2d1b23ed1.zip
When dropping deps from the resume list, make sure that the loop can't
be infinite. svn path=/main/trunk/; revision=10493
-rw-r--r--pym/_emerge/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 7aaefbf2b..c315af65d 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -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)