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 1RvyUW-0001Bg-EV for garchives@archives.gentoo.org; Fri, 10 Feb 2012 21:58:52 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4DD32E077E; Fri, 10 Feb 2012 21:58:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1CE0DE077E for ; Fri, 10 Feb 2012 21:58:45 +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 80CA21B400B for ; Fri, 10 Feb 2012 21:58:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 17E16E53FF for ; Fri, 10 Feb 2012 21:58:43 +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: <8384ee6a6116a9055601fe7729026af2024f4fa0.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/Scheduler.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 8384ee6a6116a9055601fe7729026af2024f4fa0 Date: Fri, 10 Feb 2012 21:58:43 +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: 7fbde38c-dc2e-4ad4-a944-da711a9edfc3 X-Archives-Hash: f1459bc5a6105b3e59ab54cfff8aaaa1 commit: 8384ee6a6116a9055601fe7729026af2024f4fa0 Author: Zac Medico gentoo org> AuthorDate: Fri Feb 10 21:58:17 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Feb 10 21:58:17 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D8384ee6a Scheduler: cleanup timeout after _main_loop The way we don't leave an leak a reference to the Scheduler instance in the global EventLoop instance. --- pym/_emerge/Scheduler.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py index 674a11e..100d89d 100644 --- a/pym/_emerge/Scheduler.py +++ b/pym/_emerge/Scheduler.py @@ -196,8 +196,6 @@ class Scheduler(PollScheduler): =20 self._status_display =3D JobStatusDisplay( xterm_titles=3D('notitles' not in settings.features)) - self.sched_iface.timeout_add(self._max_display_latency, - self._status_display.display) self._max_load =3D myopts.get("--load-average") max_jobs =3D myopts.get("--jobs") if max_jobs is None: @@ -1354,6 +1352,8 @@ class Scheduler(PollScheduler): failed_pkgs =3D self._failed_pkgs portage.locks._quiet =3D self._background portage.elog.add_listener(self._elog_listener) + display_timeout_id =3D self.sched_iface.timeout_add( + self._max_display_latency, self._status_display.display) rval =3D os.EX_OK =20 try: @@ -1362,6 +1362,7 @@ class Scheduler(PollScheduler): self._main_loop_cleanup() portage.locks._quiet =3D False portage.elog.remove_listener(self._elog_listener) + self.sched_iface.source_remove(display_timeout_id) if failed_pkgs: rval =3D failed_pkgs[-1].returncode =20