| 1 |
Author: zmedico |
| 2 |
Date: 2009-08-04 18:45:48 +0000 (Tue, 04 Aug 2009) |
| 3 |
New Revision: 13902 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/dbapi/vartree.py |
| 7 |
Log: |
| 8 |
Open CONTENTS in text mode (to avoid UnicodeEncodeError). Thanks to Markos |
| 9 |
Chandras <hwoarang@g.o> for reporting. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/dbapi/vartree.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/dbapi/vartree.py 2009-08-04 18:26:27 UTC (rev 13901) |
| 15 |
+++ main/trunk/pym/portage/dbapi/vartree.py 2009-08-04 18:45:48 UTC (rev 13902) |
| 16 |
@@ -37,6 +37,7 @@ |
| 17 |
|
| 18 |
from portage.cache.mappings import slot_dict_class |
| 19 |
|
| 20 |
+import codecs |
| 21 |
import os, re, shutil, stat, errno, copy, subprocess |
| 22 |
import logging |
| 23 |
import shlex |
| 24 |
@@ -1864,7 +1865,8 @@ |
| 25 |
return self.contentscache |
| 26 |
pkgfiles = {} |
| 27 |
try: |
| 28 |
- myc = open(contents_file,"r") |
| 29 |
+ myc = codecs.open(contents_file, mode='r', |
| 30 |
+ encoding='utf_8', errors='replace') |
| 31 |
except EnvironmentError, e: |
| 32 |
if e.errno != errno.ENOENT: |
| 33 |
raise |
| 34 |
@@ -3432,7 +3434,8 @@ |
| 35 |
lcfile.close() |
| 36 |
|
| 37 |
# open CONTENTS file (possibly overwriting old one) for recording |
| 38 |
- outfile = open(os.path.join(self.dbtmpdir, "CONTENTS"),"w") |
| 39 |
+ outfile = codecs.open(os.path.join(self.dbtmpdir, 'CONTENTS'), |
| 40 |
+ mode='w', encoding='utf_8', errors='replace') |
| 41 |
|
| 42 |
self.updateprotect() |
Archives