EbuildMetadataPhase: use b''.join() for bytes
authorZac Medico <zmedico@gentoo.org>
Sat, 15 Oct 2011 19:34:09 +0000 (12:34 -0700)
committerZac Medico <zmedico@gentoo.org>
Sat, 15 Oct 2011 19:34:09 +0000 (12:34 -0700)
pym/_emerge/EbuildMetadataPhase.py

index aeff2f0e86c0a0e05fe56675870d6b63c6ccbf4a..95729e805562db3009f9f9b740e5cf27787f9161 100644 (file)
@@ -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.