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 1RwMwu-0003yv-3B for garchives@archives.gentoo.org; Sun, 12 Feb 2012 00:05:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E151AE0762; Sun, 12 Feb 2012 00:05:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B483DE068E for ; Sun, 12 Feb 2012 00:05:40 +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 2781F1B400B for ; Sun, 12 Feb 2012 00:05:40 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D6628E53FF for ; Sun, 12 Feb 2012 00:05:38 +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: <71b3466c9bc7c00835bf4665765d05b14c2c5c49.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/QueueScheduler.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 71b3466c9bc7c00835bf4665765d05b14c2c5c49 Date: Sun, 12 Feb 2012 00:05:38 +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: 938647e9-ce4d-4528-803d-8b6564b7b65d X-Archives-Hash: 7fdf55cb249b83c3a56570b328bc37b0 commit: 71b3466c9bc7c00835bf4665765d05b14c2c5c49 Author: Zac Medico gentoo org> AuthorDate: Sun Feb 12 00:05:14 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Feb 12 00:05:14 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D71b3466c QueueScheduler: tweak run loop logic --- pym/_emerge/QueueScheduler.py | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/QueueScheduler.py b/pym/_emerge/QueueScheduler.p= y index 5f8cf26..731a677 100644 --- a/pym/_emerge/QueueScheduler.py +++ b/pym/_emerge/QueueScheduler.py @@ -44,15 +44,15 @@ class QueueScheduler(PollScheduler): timeout, timeout_callback) =20 try: - self._schedule() - - while self._keep_scheduling() and \ - not (timeout_callback is not None and + while not (timeout_callback is not None and timeout_callback.timed_out): # We don't have any callbacks to trigger _schedule(), # so we have to call it explicitly here. self._schedule() - self.sched_iface.iteration() + if self._keep_scheduling(): + self.sched_iface.iteration() + else: + break =20 while self._is_work_scheduled() and \ not (timeout_callback is not None and