| 1 |
Author: zmedico |
| 2 |
Date: 2008-07-28 21:31:51 +0000 (Mon, 28 Jul 2008) |
| 3 |
New Revision: 11249 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Bug #233165 - When waiting for jobs and merges to finish in |
| 9 |
Scheduler._main_loop(), keep scheduling the merge queue since |
| 10 |
it doesn't autoschedule, and skip the poll loop if there no |
| 11 |
event handlers due to synchronous merge tasks being the only |
| 12 |
things left to do. |
| 13 |
|
| 14 |
|
| 15 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 16 |
=================================================================== |
| 17 |
--- main/trunk/pym/_emerge/__init__.py 2008-07-28 20:26:09 UTC (rev 11248) |
| 18 |
+++ main/trunk/pym/_emerge/__init__.py 2008-07-28 21:31:51 UTC (rev 11249) |
| 19 |
@@ -9622,6 +9622,9 @@ |
| 20 |
self._poll_loop() |
| 21 |
|
| 22 |
while self._jobs or merge_queue: |
| 23 |
+ if merge_queue.schedule() and \ |
| 24 |
+ not self._poll_event_handlers: |
| 25 |
+ continue |
| 26 |
self._poll_loop() |
| 27 |
|
| 28 |
def _schedule_tasks(self): |
Archives