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 1RvMOH-0002bv-E9 for garchives@archives.gentoo.org; Thu, 09 Feb 2012 05:17:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A61E0E06FC; Thu, 9 Feb 2012 05:17:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 712A5E06FC for ; Thu, 9 Feb 2012 05:17: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 A4CC71B4031 for ; Thu, 9 Feb 2012 05:17:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5A8EFE53FF for ; Thu, 9 Feb 2012 05:17: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: <7092cf7fcbd1c51bd739110baaea9da011c5ebf5.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/_MergeProcess.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 7092cf7fcbd1c51bd739110baaea9da011c5ebf5 Date: Thu, 9 Feb 2012 05:17: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: f780fbaa-b8b2-4858-87bd-4a482ee2a2ee X-Archives-Hash: f3eec1585d1047d02f34c97f8e0e7ed3 commit: 7092cf7fcbd1c51bd739110baaea9da011c5ebf5 Author: Zac Medico gentoo org> AuthorDate: Thu Feb 9 05:17:18 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Feb 9 05:17:18 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D7092cf7f MergeProcess: handle POLLHUP from elog pipe --- pym/portage/dbapi/_MergeProcess.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/pym/portage/dbapi/_MergeProcess.py b/pym/portage/dbapi/_Merg= eProcess.py index eed7bd4..da278ea 100644 --- a/pym/portage/dbapi/_MergeProcess.py +++ b/pym/portage/dbapi/_MergeProcess.py @@ -83,6 +83,13 @@ class MergeProcess(SpawnProcess): reporter =3D getattr(portage.elog.messages, funcname) reporter(msg, phase=3Dphase, key=3Dkey, out=3Dout) =20 + if event & PollConstants.POLLHUP: + self.scheduler.unregister(self._elog_reg_id) + self._elog_reg_id =3D None + os.close(self._elog_reader_fd) + self._elog_reader_fd =3D None + return False + return True =20 def _spawn(self, args, fd_pipes, **kwargs):