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 1RWDpI-00060U-8V for garchives@archives.gentoo.org; Thu, 01 Dec 2011 21:05:52 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9009821C065; Thu, 1 Dec 2011 21:05:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 6544621C088 for ; Thu, 1 Dec 2011 21:05:44 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B8FD61B4024 for ; Thu, 1 Dec 2011 21:05:43 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1DD5280044 for ; Thu, 1 Dec 2011 21:05: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: Subject: [gentoo-commits] proj/portage:master commit in: pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/SubProcess.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: b573f6f81c4500af9a4d08d58746d59c2b95f67c Date: Thu, 1 Dec 2011 21:05: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: 79d3ed07-79bc-4b48-b172-c6dcb2c39775 X-Archives-Hash: 3c61c37f807013906a941458818885d0 commit: b573f6f81c4500af9a4d08d58746d59c2b95f67c Author: Zac Medico gentoo org> AuthorDate: Thu Dec 1 21:05:24 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Dec 1 21:05:24 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Db573f6f8 _emerge/SubProcess.py: support int fd in _files --- pym/_emerge/SubProcess.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/SubProcess.py b/pym/_emerge/SubProcess.py index b99cf0b..37922dc 100644 --- a/pym/_emerge/SubProcess.py +++ b/pym/_emerge/SubProcess.py @@ -120,7 +120,10 @@ class SubProcess(AbstractPollTask): =20 if self._files is not None: for f in self._files.values(): - f.close() + if isinstance(f, int): + os.close(f) + else: + f.close() self._files =3D None =20 def _set_returncode(self, wait_retval):