| 1 |
Author: zmedico |
| 2 |
Date: 2008-07-29 19:54:52 +0000 (Tue, 29 Jul 2008) |
| 3 |
New Revision: 11270 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Fix the last part of Scheduler._main_loop() to work correctly now that |
| 9 |
all the queues have auto_schedule disabled. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-07-29 19:30:37 UTC (rev 11269) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-07-29 19:54:52 UTC (rev 11270) |
| 16 |
@@ -9641,14 +9641,16 @@ |
| 17 |
while self._schedule(): |
| 18 |
self._poll_loop() |
| 19 |
|
| 20 |
- while self._jobs or merge_queue: |
| 21 |
- if merge_queue.schedule() and \ |
| 22 |
- not self._poll_event_handlers: |
| 23 |
- continue |
| 24 |
- self._poll_loop() |
| 25 |
+ while True: |
| 26 |
+ self._schedule() |
| 27 |
+ if not self._jobs or merge_queue: |
| 28 |
+ break |
| 29 |
+ if self._poll_event_handlers: |
| 30 |
+ self._poll_loop() |
| 31 |
|
| 32 |
def _schedule_tasks(self): |
| 33 |
remaining, state_change = self._schedule_tasks_imp() |
| 34 |
+ self._status_display.display() |
| 35 |
for q in self._task_queues.values(): |
| 36 |
q.schedule() |
Archives