PollScheduler: schedule inside loop if max_load

This will fix a case like that reported in bug #403895, triggered when
the --load-average option is used.

diff --git a/pym/_emerge/PollScheduler.py b/pym/_emerge/PollScheduler.py
index 965dc20ee03e74de8680bad50a0edc5ad46ce263..5103e31d60054daf9fd6800d8f1f86c820b4e57a 100644 (file)
--- a/pym/_emerge/PollScheduler.py
+++ b/pym/_emerge/PollScheduler.py
@@ -148,15 +148,22 @@ class PollScheduler(object):
        def _main_loop(self):
                term_check_id = self.sched_iface.idle_add(self._termination_check)
                try:
-                       # Populate initial event sources. We only need to do
-                       # this once here, since it can be called during the
-                       # loop from within event handlers.
+                       # Populate initial event sources. Unless we're scheduling
+                       # based on load average, we only need to do this once
+                       # here, since it can be called during the loop from within
+                       # event handlers.
                        self._schedule()
+                       max_load = self._max_load
 
                        # Loop while there are jobs to be scheduled.
                        while self._keep_scheduling():
                                self.sched_iface.iteration()
 
+                               if max_load is not None:
+                                       # We have to schedule periodically, in case the load
+                                       # average has changed since the last call.
+                                       self._schedule()
+
                        # Clean shutdown of previously scheduled jobs. In the
                        # case of termination, this allows for basic cleanup
                        # such as flushing of buffered output to logs.