diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-10-15 12:34:09 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-10-15 12:34:09 -0700 |
| commit | ff98e89d26d4e0d4436473d9c9afab8f01c448f5 (patch) | |
| tree | 9647821bbf5d2d27299c89f497ae62c00f2d5eb2 | |
| parent | 5e0a1972beb98d31772c8eb10ac70df5f608e2a1 (diff) | |
| download | portage-ff98e89d26d4e0d4436473d9c9afab8f01c448f5.tar.gz portage-ff98e89d26d4e0d4436473d9c9afab8f01c448f5.tar.bz2 portage-ff98e89d26d4e0d4436473d9c9afab8f01c448f5.zip | |
EbuildMetadataPhase: use b''.join() for bytes
| -rw-r--r-- | pym/_emerge/EbuildMetadataPhase.py | 6 |
1 files changed, 3 insertions, 3 deletions
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. |