diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-05-29 23:41:57 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-05-29 23:41:57 +0000 |
| commit | 96c6b245c2b6e3e18376d89b4db7a16a4020ccc3 (patch) | |
| tree | d99067b6e2737c6733f3823fdeca3d354c1c917e | |
| parent | 6bb3cb1b6d6f7c19abfa19d1bf6d68f6a3a59777 (diff) | |
| download | portage-96c6b245c2b6e3e18376d89b4db7a16a4020ccc3.tar.gz portage-96c6b245c2b6e3e18376d89b4db7a16a4020ccc3.tar.bz2 portage-96c6b245c2b6e3e18376d89b4db7a16a4020ccc3.zip | |
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
| -rwxr-xr-x | bin/emerge | 3 |
1 files changed, 2 insertions, 1 deletions
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) |