From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RwJCt-0008Ph-1N for garchives@archives.gentoo.org; Sat, 11 Feb 2012 20:06:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 10260E0858; Sat, 11 Feb 2012 20:05:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C796AE0858 for ; Sat, 11 Feb 2012 20:05:55 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 11AB51B4008 for ; Sat, 11 Feb 2012 20:05:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CC3A2E53FF for ; Sat, 11 Feb 2012 20:05:53 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <0f55a5a75c410d73779f7090784d06e40e03a1c9.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/MetadataRegen.py pym/_emerge/PollScheduler.py pym/_emerge/Scheduler.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 0f55a5a75c410d73779f7090784d06e40e03a1c9 Date: Sat, 11 Feb 2012 20:05:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ce876ad6-32e3-45a6-bcda-2b53678bef28 X-Archives-Hash: 679d0960e0a958062d1062c00f10d23d commit: 0f55a5a75c410d73779f7090784d06e40e03a1c9 Author: Zac Medico gentoo org> AuthorDate: Sat Feb 11 20:05:17 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Feb 11 20:05:17 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D0f55a5a7 PollScheduler: return None from _schedule_tasks The _keep_scheduling() template method is used instead. --- pym/_emerge/MetadataRegen.py | 10 ++-------- pym/_emerge/PollScheduler.py | 15 ++++++++++----- pym/_emerge/Scheduler.py | 2 -- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/pym/_emerge/MetadataRegen.py b/pym/_emerge/MetadataRegen.py index 3404001..efe3004 100644 --- a/pym/_emerge/MetadataRegen.py +++ b/pym/_emerge/MetadataRegen.py @@ -139,27 +139,21 @@ class MetadataRegen(PollScheduler): pass =20 def _schedule_tasks(self): - """ - @rtype: bool - @returns: True if there may be remaining tasks to schedule, - False otherwise. - """ if self._terminated_tasks: - return False + return =20 while self._can_add_job(): try: metadata_process =3D next(self._process_iter) except StopIteration: self._remaining_tasks =3D False - return False + return =20 self._jobs +=3D 1 self._running_tasks.add(metadata_process) metadata_process.scheduler =3D self.sched_iface metadata_process.addExitListener(self._metadata_exit) metadata_process.start() - return True =20 def _metadata_exit(self, metadata_process): self._jobs -=3D 1 diff --git a/pym/_emerge/PollScheduler.py b/pym/_emerge/PollScheduler.py index 3b3ef67..e270e6a 100644 --- a/pym/_emerge/PollScheduler.py +++ b/pym/_emerge/PollScheduler.py @@ -70,6 +70,14 @@ class PollScheduler(object): """ raise NotImplementedError() =20 + def _keep_scheduling(self): + """ + @rtype: bool + @returns: True if there may be remaining tasks to schedule, + False otherwise. + """ + return False + def _schedule_tasks(self): """ This is called from inside the _schedule() method, which @@ -83,7 +91,7 @@ class PollScheduler(object): Unless this method is used to perform user interface updates, or something like that, the first thing it should do is check the state of _terminated_tasks and if that is True then it - should return False immediately (since there's no need to + should return immediately (since there's no need to schedule anything after _terminate_tasks() has been called). """ pass @@ -105,7 +113,7 @@ class PollScheduler(object): self._terminated_tasks =3D True self._terminate_tasks() =20 - return self._schedule_tasks() + self._schedule_tasks() finally: self._scheduling =3D False =20 @@ -125,9 +133,6 @@ class PollScheduler(object): while self._is_work_scheduled(): self.sched_iface.iteration() =20 - def _keep_scheduling(self): - return False - def _is_work_scheduled(self): return bool(self._running_job_count()) =20 diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 66d76b1..5bb4fe8 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -1542,8 +1542,6 @@ class Scheduler(PollScheduler): not self._task_queues.merge)): break =20 - return self._keep_scheduling() - def _job_delay(self): """ @rtype: bool