From: Zac Medico Date: Sat, 15 Oct 2011 19:34:09 +0000 (-0700) Subject: EbuildMetadataPhase: use b''.join() for bytes X-Git-Tag: v2.2.0_alpha68~31 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ff98e89d26d4e0d4436473d9c9afab8f01c448f5;p=portage.git EbuildMetadataPhase: use b''.join() for bytes --- diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetadataPhase.py index aeff2f0e8..95729e805 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 == os.EX_OK: - metadata_lines = ''.join(_unicode_decode(chunk, - encoding=_encodings['repo.content'], errors='replace') - for chunk in self._raw_metadata).splitlines() + metadata_lines = _unicode_decode(b''.join(self._raw_metadata), + encoding=_encodings['repo.content'], + errors='replace').splitlines() if len(portage.auxdbkeys) != len(metadata_lines): # Don't trust bash's returncode if the # number of lines is incorrect.