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 1RWMOM-0003Ee-0P for garchives@archives.gentoo.org; Fri, 02 Dec 2011 06:14:38 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73DA821C023; Fri, 2 Dec 2011 06:14:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 36DF721C023 for ; Fri, 2 Dec 2011 06:14:24 +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 976651B4019 for ; Fri, 2 Dec 2011 06:14:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id CB52C80044 for ; Fri, 2 Dec 2011 06:14:22 +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/AsynchronousLock.py pym/_emerge/EbuildMetadataPhase.py pym/_emerge/PipeReader.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: c6c71eefb9532af0d4505de70e58f45ad8e8fe0a Date: Fri, 2 Dec 2011 06:14:22 +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: e18ca781-47b9-4613-aa0d-7e41bb9aaa06 X-Archives-Hash: 8f81530b4a1ef5c642d05715a2be058f commit: c6c71eefb9532af0d4505de70e58f45ad8e8fe0a Author: Zac Medico gentoo org> AuthorDate: Fri Dec 2 06:14:13 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Dec 2 06:14:13 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dc6c71eef Handle OSError from os.read and loop if needed. Looping fixes EbuildMetadataPhase failures for ebuilds that produce more than 4096 bytes of metadata, broken since commit b432a1b3051d91546649e8f3190675767461d8e8. --- pym/_emerge/AsynchronousLock.py | 4 ++-- pym/_emerge/EbuildMetadataPhase.py | 23 +++++++++++++---------- pym/_emerge/PipeReader.py | 25 ++++++++++++++----------- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/pym/_emerge/AsynchronousLock.py b/pym/_emerge/AsynchronousLo= ck.py index 39e36c8..9d0545b 100644 --- a/pym/_emerge/AsynchronousLock.py +++ b/pym/_emerge/AsynchronousLock.py @@ -138,7 +138,7 @@ class _LockThread(AbstractPollTask): if event & PollConstants.POLLIN: try: buf =3D os.read(self._files['pipe_read'], self._bufsize) - except IOError as e: + except OSError as e: if e.errno not in (errno.EAGAIN,): raise if buf: @@ -274,7 +274,7 @@ class _LockProcess(AbstractPollTask): if event & PollConstants.POLLIN: try: buf =3D os.read(self._files['pipe_in'], self._bufsize) - except IOError as e: + except OSError as e: if e.errno not in (errno.EAGAIN,): raise if buf: diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetad= ataPhase.py index e068e8f..d4f5bc0 100644 --- a/pym/_emerge/EbuildMetadataPhase.py +++ b/pym/_emerge/EbuildMetadataPhase.py @@ -112,16 +112,19 @@ class EbuildMetadataPhase(SubProcess): def _output_handler(self, fd, event): =20 if event & PollConstants.POLLIN: - 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() + while True: + try: + self._raw_metadata.append( + os.read(self._files.ebuild, self._bufsize)) + except OSError as e: + if e.errno not in (errno.EAGAIN,): + raise + break + else: + if not self._raw_metadata[-1]: + self._unregister() + self.wait() + break =20 self._unregister_if_appropriate(event) =20 diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py index 67144c3..af8cfdd 100644 --- a/pym/_emerge/PipeReader.py +++ b/pym/_emerge/PipeReader.py @@ -59,18 +59,21 @@ class PipeReader(AbstractPollTask): =20 if event & PollConstants.POLLIN: =20 - data =3D None - try: - data =3D os.read(fd, self._bufsize) - except IOError as e: - if e.errno not in (errno.EAGAIN,): - raise - else: - if data: - self._read_data.append(data) + while True: + data =3D None + try: + data =3D os.read(fd, self._bufsize) + except OSError as e: + if e.errno not in (errno.EAGAIN,): + raise + break else: - self._unregister() - self.wait() + if data: + self._read_data.append(data) + else: + self._unregister() + self.wait() + break =20 self._unregister_if_appropriate(event) =20