From 96c6b245c2b6e3e18376d89b4db7a16a4020ccc3 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 29 May 2008 23:41:57 +0000 Subject: 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 --- bin/emerge | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index 9d3ac1d78..a232565c5 100755 --- 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) -- cgit v1.2.3-1-g7c22