From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B565E138010 for ; Wed, 3 Oct 2012 10:19:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B4BBBE0230; Wed, 3 Oct 2012 10:19:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 7CA40E0230 for ; Wed, 3 Oct 2012 10:19:03 +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 D38F233D752 for ; Wed, 3 Oct 2012 10:19:02 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 8655CE5436 for ; Wed, 3 Oct 2012 10:19:01 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1349259526.117eeee2de26723a90ff072b7c795b1b0766898b.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/util/_async/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/util/_async/AsyncScheduler.py X-VCS-Directories: pym/portage/util/_async/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 117eeee2de26723a90ff072b7c795b1b0766898b X-VCS-Branch: master Date: Wed, 3 Oct 2012 10:19:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2ec76c71-69b3-4257-a61b-d3f91436bb92 X-Archives-Hash: 37fcb8036d7a8c778434ac99ee39aace commit: 117eeee2de26723a90ff072b7c795b1b0766898b Author: Zac Medico gentoo org> AuthorDate: Wed Oct 3 10:18:46 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed Oct 3 10:18:46 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=117eeee2 AsyncScheduler: source_remove in _wait --- pym/portage/util/_async/AsyncScheduler.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/pym/portage/util/_async/AsyncScheduler.py b/pym/portage/util/_async/AsyncScheduler.py index cae45fd..130331e 100644 --- a/pym/portage/util/_async/AsyncScheduler.py +++ b/pym/portage/util/_async/AsyncScheduler.py @@ -80,6 +80,14 @@ class AsyncScheduler(AsynchronousTask, PollScheduler): while self._is_work_scheduled(): self.sched_iface.iteration() + if self._term_check_id is not None: + self.sched_iface.source_remove(self._term_check_id) + self._term_check_id = None + + if self._loadavg_check_id is not None: + self.sched_iface.source_remove(self._loadavg_check_id) + self._loadavg_check_id = None + if self._error_count > 0: self.returncode = 1 else: