| 1 |
Author: zmedico |
| 2 |
Date: 2009-07-04 20:20:43 +0000 (Sat, 04 Jul 2009) |
| 3 |
New Revision: 13785 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/EbuildMetadataPhase.py |
| 7 |
main/trunk/pym/portage/__init__.py |
| 8 |
Log: |
| 9 |
Assume utf_8 encoding when reading raw ebuild metadata. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/EbuildMetadataPhase.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/EbuildMetadataPhase.py 2009-07-04 19:57:22 UTC (rev 13784) |
| 15 |
+++ main/trunk/pym/_emerge/EbuildMetadataPhase.py 2009-07-04 20:20:43 UTC (rev 13785) |
| 16 |
@@ -123,7 +123,9 @@ |
| 17 |
def _set_returncode(self, wait_retval): |
| 18 |
SubProcess._set_returncode(self, wait_retval) |
| 19 |
if self.returncode == os.EX_OK: |
| 20 |
- metadata_lines = "".join(self._raw_metadata).splitlines() |
| 21 |
+ metadata_lines = u''.join(unicode(chunk, |
| 22 |
+ encoding='utf_8', errors='replace') |
| 23 |
+ for chunk in self._raw_metadata).splitlines() |
| 24 |
if len(portage.auxdbkeys) != len(metadata_lines): |
| 25 |
# Don't trust bash's returncode if the |
| 26 |
# number of lines is incorrect. |
| 27 |
|
| 28 |
Modified: main/trunk/pym/portage/__init__.py |
| 29 |
=================================================================== |
| 30 |
--- main/trunk/pym/portage/__init__.py 2009-07-04 19:57:22 UTC (rev 13784) |
| 31 |
+++ main/trunk/pym/portage/__init__.py 2009-07-04 20:20:43 UTC (rev 13785) |
| 32 |
@@ -6070,7 +6070,8 @@ |
| 33 |
if not mybytes[-1]: |
| 34 |
break |
| 35 |
os.close(pr) |
| 36 |
- mybytes = "".join(mybytes) |
| 37 |
+ mybytes = u''.join(unicode(chunk, |
| 38 |
+ encoding='utf_8', errors='replace') for chunk in mybytes) |
| 39 |
global auxdbkeys |
| 40 |
for k, v in izip(auxdbkeys, mybytes.splitlines()): |
| 41 |
dbkey[k] = v |
Archives