summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-07-30 03:17:11 +0000
committerZac Medico <zmedico@gentoo.org>2008-07-30 03:17:11 +0000
commit68c7cb49cd4b2d6d2cba806b401382b9ed9d14d0 (patch)
tree16bb3869c26b58c49090e9b60b038c88bda63d81
parent67e666904b06d01b620a0193fed01c79d7f43ff2 (diff)
downloadportage-68c7cb49cd4b2d6d2cba806b401382b9ed9d14d0.tar.gz
portage-68c7cb49cd4b2d6d2cba806b401382b9ed9d14d0.tar.bz2
portage-68c7cb49cd4b2d6d2cba806b401382b9ed9d14d0.zip
Just return a boolean "state changed" value from
Scheduler._schedule_tasks_imp(), since the other "remaining" part is now unused. svn path=/main/trunk/; revision=11276
-rw-r--r--pym/_emerge/__init__.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 074ecc68e..f69928ee3 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -9658,7 +9658,7 @@ class Scheduler(PollScheduler):
self._poll_loop()
def _schedule_tasks(self):
- remaining, state_change = self._schedule_tasks_imp()
+ self._schedule_tasks_imp()
self._status_display.display()
state_change = 0
@@ -9675,7 +9675,7 @@ class Scheduler(PollScheduler):
state_change += 1
if state_change:
- remaining, state_change = self._schedule_tasks_imp()
+ self._schedule_tasks_imp()
self._status_display.display()
return bool(self._pkg_queue and not self._failed_pkgs)
@@ -9699,7 +9699,7 @@ class Scheduler(PollScheduler):
def _schedule_tasks_imp(self):
"""
@rtype: bool
- @returns: True if tasks remain to schedule, False otherwise.
+ @returns: True if state changed, False otherwise.
"""
state_change = 0
@@ -9707,16 +9707,16 @@ class Scheduler(PollScheduler):
while True:
if not self._pkg_queue or self._failed_pkgs:
- return (False, state_change)
+ return bool(state_change)
if self._choose_pkg_return_early or \
not self._can_add_job() or \
self._job_delay():
- return (True, state_change)
+ return bool(state_change)
pkg = self._choose_pkg()
if pkg is None:
- return (True, state_change)
+ return bool(state_change)
state_change += 1
@@ -9744,7 +9744,7 @@ class Scheduler(PollScheduler):
task.addExitListener(self._build_exit)
self._task_queues.jobs.add(task)
- return (True, state_change)
+ return bool(state_change)
def _task(self, pkg):