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

1 files changed, 7 insertions, 5 deletions

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 3fee85d03..11380c026 100644
--- 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()