diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-21 14:15:49 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-09-21 14:15:49 +0000 |
| commit | 2f9b8514e4d4b15569ebc88e7da36f5ae972c37e (patch) | |
| tree | 2135fe4428dd3e9ec4c8226885fae1d30e14514a /pym/_emerge/EbuildMetadataPhase.py | |
| parent | Use dep_expand instead of key_expand in the blocker display, since it seems (diff) | |
| download | portage-2f9b8514e4d4b15569ebc88e7da36f5ae972c37e.tar.gz portage-2f9b8514e4d4b15569ebc88e7da36f5ae972c37e.tar.bz2 portage-2f9b8514e4d4b15569ebc88e7da36f5ae972c37e.zip | |
Support both Python 2 and 3 in portage._unicode_encode() and portage._unicode_decode().
Update decoding in some files.
svn path=/main/trunk/; revision=14321
Diffstat (limited to 'pym/_emerge/EbuildMetadataPhase.py')
| -rw-r--r-- | pym/_emerge/EbuildMetadataPhase.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetadataPhase.py index 07d993b7d..1231b1b11 100644 --- a/pym/_emerge/EbuildMetadataPhase.py +++ b/pym/_emerge/EbuildMetadataPhase.py @@ -9,6 +9,7 @@ from portage.cache.mappings import slot_dict_class import portage from portage import os from portage import _encodings +from portage import _unicode_decode from portage import _unicode_encode import fcntl import codecs @@ -122,7 +123,7 @@ 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(chunk, + metadata_lines = ''.join(_unicode_decode(chunk, encoding=_encodings['repo.content'], errors='replace') for chunk in self._raw_metadata).splitlines() if len(portage.auxdbkeys) != len(metadata_lines): |