| 1 |
Author: zmedico |
| 2 |
Date: 2008-07-30 03:17:11 +0000 (Wed, 30 Jul 2008) |
| 3 |
New Revision: 11276 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Just return a boolean "state changed" value from |
| 9 |
Scheduler._schedule_tasks_imp(), since the other |
| 10 |
"remaining" part is now unused. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/_emerge/__init__.py 2008-07-30 03:07:40 UTC (rev 11275) |
| 16 |
+++ main/trunk/pym/_emerge/__init__.py 2008-07-30 03:17:11 UTC (rev 11276) |
| 17 |
@@ -9658,7 +9658,7 @@ |
| 18 |
self._poll_loop() |
| 19 |
|
| 20 |
def _schedule_tasks(self): |
| 21 |
- remaining, state_change = self._schedule_tasks_imp() |
| 22 |
+ self._schedule_tasks_imp() |
| 23 |
self._status_display.display() |
| 24 |
|
| 25 |
state_change = 0 |
| 26 |
@@ -9675,7 +9675,7 @@ |
| 27 |
state_change += 1 |
| 28 |
|
| 29 |
if state_change: |
| 30 |
- remaining, state_change = self._schedule_tasks_imp() |
| 31 |
+ self._schedule_tasks_imp() |
| 32 |
self._status_display.display() |
| 33 |
|
| 34 |
return bool(self._pkg_queue and not self._failed_pkgs) |
| 35 |
@@ -9699,7 +9699,7 @@ |
| 36 |
def _schedule_tasks_imp(self): |
| 37 |
""" |
| 38 |
@rtype: bool |
| 39 |
- @returns: True if tasks remain to schedule, False otherwise. |
| 40 |
+ @returns: True if state changed, False otherwise. |
| 41 |
""" |
| 42 |
|
| 43 |
state_change = 0 |
| 44 |
@@ -9707,16 +9707,16 @@ |
| 45 |
while True: |
| 46 |
|
| 47 |
if not self._pkg_queue or self._failed_pkgs: |
| 48 |
- return (False, state_change) |
| 49 |
+ return bool(state_change) |
| 50 |
|
| 51 |
if self._choose_pkg_return_early or \ |
| 52 |
not self._can_add_job() or \ |
| 53 |
self._job_delay(): |
| 54 |
- return (True, state_change) |
| 55 |
+ return bool(state_change) |
| 56 |
|
| 57 |
pkg = self._choose_pkg() |
| 58 |
if pkg is None: |
| 59 |
- return (True, state_change) |
| 60 |
+ return bool(state_change) |
| 61 |
|
| 62 |
state_change += 1 |
| 63 |
|
| 64 |
@@ -9744,7 +9744,7 @@ |
| 65 |
task.addExitListener(self._build_exit) |
| 66 |
self._task_queues.jobs.add(task) |
| 67 |
|
| 68 |
- return (True, state_change) |
| 69 |
+ return bool(state_change) |
| 70 |
|
| 71 |
def _task(self, pkg): |
Archives