1 |
Author: zmedico |
2 |
Date: 2008-05-29 23:40:58 +0000 (Thu, 29 May 2008) |
3 |
New Revision: 10493 |
4 |
|
5 |
Modified: |
6 |
main/trunk/pym/_emerge/__init__.py |
7 |
Log: |
8 |
When dropping deps from the resume list, make sure that the loop can't |
9 |
be infinite. |
10 |
|
11 |
|
12 |
Modified: main/trunk/pym/_emerge/__init__.py |
13 |
=================================================================== |
14 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-29 23:32:40 UTC (rev 10492) |
15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-29 23:40:58 UTC (rev 10493) |
16 |
@@ -8381,7 +8381,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 |