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 <gentoo-commits+bounces-329309-garchives=archives.gentoo.org@lists.gentoo.org>) id 1Q3AGF-0001Yi-81 for garchives@archives.gentoo.org; Fri, 25 Mar 2011 16:53:19 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C8BC1C05C; Fri, 25 Mar 2011 16:53:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6CF8B1C05C for <gentoo-commits@lists.gentoo.org>; Fri, 25 Mar 2011 16:53:07 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DA7B51B4102 for <gentoo-commits@lists.gentoo.org>; Fri, 25 Mar 2011 16:53:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 422D98006A for <gentoo-commits@lists.gentoo.org>; Fri, 25 Mar 2011 16:53:06 +0000 (UTC) From: "Zac Medico" <zmedico@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" <zmedico@gentoo.org> Message-ID: <1f1e49dfcbb1858af8a0a09165bb311aac33b423.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/PollScheduler.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 1f1e49dfcbb1858af8a0a09165bb311aac33b423 Date: Fri, 25 Mar 2011 16:53:06 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 8a6084e3f6ca4f56fcf703a325bbe017 commit: 1f1e49dfcbb1858af8a0a09165bb311aac33b423 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Fri Mar 25 16:52:40 2011 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Fri Mar 25 16:52:40 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D1f1e49df PollScheduler: tweak _unregister event cleanup --- pym/_emerge/PollScheduler.py | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pym/_emerge/PollScheduler.py b/pym/_emerge/PollScheduler.py index 043f02a..a2b5c24 100644 --- a/pym/_emerge/PollScheduler.py +++ b/pym/_emerge/PollScheduler.py @@ -250,13 +250,17 @@ class PollScheduler(object): # delivered to a future handler that is using a reallocated # file descriptor of the same numeric value (causing # extremely confusing bugs). - remove =3D set() + remaining_events =3D [] + discarded_events =3D False for event in self._poll_event_queue: if event[0] =3D=3D f: - remove.add(event) - if remove: - self._poll_event_queue[:] =3D [event for event in \ - self._poll_event_queue if event not in remove] + discarded_events =3D True + else: + remaining_events.append(event) + + if discarded_events: + self._poll_event_queue[:] =3D remaining_events + del self._poll_event_handlers[f] del self._poll_event_handler_ids[reg_id] =20