| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-29 23:41:57 +0000 (Thu, 29 May 2008) |
| 3 |
New Revision: 10494 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.2/bin/emerge |
| 7 |
Log: |
| 8 |
When dropping deps from the resume list, make sure that the loop can't |
| 9 |
be infinite. (trunk r10493) |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/branches/2.1.2/bin/emerge |
| 13 |
=================================================================== |
| 14 |
--- main/branches/2.1.2/bin/emerge 2008-05-29 23:40:58 UTC (rev 10493) |
| 15 |
+++ main/branches/2.1.2/bin/emerge 2008-05-29 23:41:57 UTC (rev 10494) |
| 16 |
@@ -8312,7 +8312,8 @@ |
| 17 |
tuple(task) in unsatisfied_parents: |
| 18 |
continue |
| 19 |
pruned_mergelist.append(task) |
| 20 |
- if not pruned_mergelist: |
| 21 |
+ if not pruned_mergelist or \ |
| 22 |
+ len(pruned_mergelist) == len(mergelist): |
| 23 |
raise |
| 24 |
mergelist[:] = pruned_mergelist |
| 25 |
dropped_tasks.update(unsatisfied_parents) |
| 26 |
|
| 27 |
-- |
| 28 |
gentoo-commits@l.g.o mailing list |
Archives