Fix the last part of Scheduler._main_loop() to work correctly now that

all the queues have auto_schedule disabled.

svn path=/main/trunk/; revision=11270

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 3fee85d0319912e61f2de42e73fc5959b8b06d45..11380c026ee9454018cce99f272a70ac141ccda8 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -9641,14 +9641,16 @@ class Scheduler(PollScheduler):
                while self._schedule():
                        self._poll_loop()
 
-               while self._jobs or merge_queue:
-                       if merge_queue.schedule() and \
-                               not self._poll_event_handlers:
-                               continue
-                       self._poll_loop()
+               while True:
+                       self._schedule()
+                       if not self._jobs or merge_queue:
+                               break
+                       if self._poll_event_handlers:
+                               self._poll_loop()
 
        def _schedule_tasks(self):
                remaining, state_change = self._schedule_tasks_imp()
+               self._status_display.display()
                for q in self._task_queues.values():
                        q.schedule()