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 1RFA07-0000VY-5b for garchives@archives.gentoo.org; Sat, 15 Oct 2011 19:34:31 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37F3E21C290; Sat, 15 Oct 2011 19:34:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0811E21C290 for ; Sat, 15 Oct 2011 19:34:23 +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 896D01B400A for ; Sat, 15 Oct 2011 19:34:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id C52DE80042 for ; Sat, 15 Oct 2011 19:34: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/EbuildMetadataPhase.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: ff98e89d26d4e0d4436473d9c9afab8f01c448f5 Date: Sat, 15 Oct 2011 19:34: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: X-Archives-Hash: d0c764785ba1d885c3a6c3bb55efe3dc commit: ff98e89d26d4e0d4436473d9c9afab8f01c448f5 Author: Zac Medico gentoo org> AuthorDate: Sat Oct 15 19:34:09 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Oct 15 19:34:09 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dff98e89d EbuildMetadataPhase: use b''.join() for bytes --- pym/_emerge/EbuildMetadataPhase.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetad= ataPhase.py index aeff2f0..95729e8 100644 --- a/pym/_emerge/EbuildMetadataPhase.py +++ b/pym/_emerge/EbuildMetadataPhase.py @@ -118,9 +118,9 @@ class EbuildMetadataPhase(SubProcess): def _set_returncode(self, wait_retval): SubProcess._set_returncode(self, wait_retval) if self.returncode =3D=3D os.EX_OK: - metadata_lines =3D ''.join(_unicode_decode(chunk, - encoding=3D_encodings['repo.content'], errors=3D'replace') - for chunk in self._raw_metadata).splitlines() + metadata_lines =3D _unicode_decode(b''.join(self._raw_metadata), + encoding=3D_encodings['repo.content'], + errors=3D'replace').splitlines() if len(portage.auxdbkeys) !=3D len(metadata_lines): # Don't trust bash's returncode if the # number of lines is incorrect.