| 1 |
Author: zmedico |
| 2 |
Date: 2008-07-29 17:13:52 +0000 (Tue, 29 Jul 2008) |
| 3 |
New Revision: 11266 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Make sure Scheduler._choose_pkg() doesn't return a package too early when |
| 9 |
there's no digraph and the previous merge hasn't completed yet. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-07-29 16:51:33 UTC (rev 11265) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-07-29 17:13:52 UTC (rev 11266) |
| 16 |
@@ -9568,6 +9568,9 @@ |
| 17 |
return None |
| 18 |
|
| 19 |
if self._digraph is None: |
| 20 |
+ if self._jobs or self._task_queues.merge: |
| 21 |
+ self._choose_pkg_return_early = True |
| 22 |
+ return None |
| 23 |
return self._pkg_queue.pop(0) |
| 24 |
|
| 25 |
self._prune_digraph() |
Archives