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 1RWE5I-00044w-Ap for garchives@archives.gentoo.org; Thu, 01 Dec 2011 21:22:25 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E20D321C033; Thu, 1 Dec 2011 21:22:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AA55E21C033 for ; Thu, 1 Dec 2011 21:22:10 +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 28A9C1B400A for ; Thu, 1 Dec 2011 21:22:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7E9F880044 for ; Thu, 1 Dec 2011 21:22:09 +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/EbuildMetadataPhase.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: b432a1b3051d91546649e8f3190675767461d8e8 Date: Thu, 1 Dec 2011 21:22:09 +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: 8c2b7c3f-e50b-4144-b54d-4daaa74aba70 X-Archives-Hash: 99ee342e14c36ecdbcca2bd36d3b80ac commit: b432a1b3051d91546649e8f3190675767461d8e8 Author: Zac Medico gentoo org> AuthorDate: Thu Dec 1 21:22:00 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Dec 1 21:22:00 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Db432a1b3 _emerge/EbuildMetadataPhase.py: use os.read() There's no need for a file object, and file objects introduce complexity that can lead to bugs as mentioned in bug 337465 comment 31, so use os.read() directly on the file descriptor. --- pym/_emerge/EbuildMetadataPhase.py | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetad= ataPhase.py index 16948df..e068e8f 100644 --- a/pym/_emerge/EbuildMetadataPhase.py +++ b/pym/_emerge/EbuildMetadataPhase.py @@ -10,6 +10,7 @@ from portage import os from portage import _encodings from portage import _unicode_decode from portage import _unicode_encode +import errno import fcntl import io =20 @@ -75,7 +76,6 @@ class EbuildMetadataPhase(SubProcess): if fd =3D=3D sys.stderr.fileno(): sys.stderr.flush() =20 - fd_pipes_orig =3D fd_pipes.copy() self._files =3D self._files_dict() files =3D self._files =20 @@ -86,8 +86,8 @@ class EbuildMetadataPhase(SubProcess): fd_pipes[self._metadata_fd] =3D slave_fd =20 self._raw_metadata =3D [] - files.ebuild =3D os.fdopen(master_fd, 'rb', 0) - self._reg_id =3D self.scheduler.register(files.ebuild.fileno(), + files.ebuild =3D master_fd + self._reg_id =3D self.scheduler.register(files.ebuild, self._registered_events, self._output_handler) self._registered =3D True =20 @@ -112,10 +112,16 @@ class EbuildMetadataPhase(SubProcess): def _output_handler(self, fd, event): =20 if event & PollConstants.POLLIN: - self._raw_metadata.append(self._files.ebuild.read()) - if not self._raw_metadata[-1]: - self._unregister() - self.wait() + try: + self._raw_metadata.append( + os.read(self._files.ebuild, self._bufsize)) + except IOError as e: + if e.errno not in (errno.EAGAIN,): + raise + else: + if not self._raw_metadata[-1]: + self._unregister() + self.wait() =20 self._unregister_if_appropriate(event) =20