diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2009-07-04 20:20:43 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-07-04 20:20:43 +0000 |
| commit | 277479ba4bea43e497cbe58ff87bef16eff55ed8 (patch) | |
| tree | 0a6b34f51f2e149ccc2bf25ba62da6816c25bcd0 /pym/_emerge/EbuildMetadataPhase.py | |
| parent | Remove the workaround from bug #263081 since most strings should be unicode (diff) | |
| download | portage-multirepo-277479ba4bea43e497cbe58ff87bef16eff55ed8.tar.gz portage-multirepo-277479ba4bea43e497cbe58ff87bef16eff55ed8.tar.bz2 portage-multirepo-277479ba4bea43e497cbe58ff87bef16eff55ed8.zip | |
Assume utf_8 encoding when reading raw ebuild metadata.
svn path=/main/trunk/; revision=13785
Diffstat (limited to 'pym/_emerge/EbuildMetadataPhase.py')
| -rw-r--r-- | pym/_emerge/EbuildMetadataPhase.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetadataPhase.py index 64f54d49..8e488d30 100644 --- a/pym/_emerge/EbuildMetadataPhase.py +++ b/pym/_emerge/EbuildMetadataPhase.py @@ -123,7 +123,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(self._raw_metadata).splitlines() + metadata_lines = u''.join(unicode(chunk, + encoding='utf_8', errors='replace') + for chunk in self._raw_metadata).splitlines() if len(portage.auxdbkeys) != len(metadata_lines): # Don't trust bash's returncode if the # number of lines is incorrect. |