diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-07-20 23:50:20 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-07-20 23:50:20 +0000 |
| commit | 581381acffbedfdc553b9643d47924bf44e32238 (patch) | |
| tree | 878d3777e6b79c5e0712e38f63505dc6e7079f21 /bin/repoman | |
| parent | 8c70715b17035030d5729972e01b2c2d3d842967 (diff) | |
| download | portage-581381acffbedfdc553b9643d47924bf44e32238.tar.gz portage-581381acffbedfdc553b9643d47924bf44e32238.tar.bz2 portage-581381acffbedfdc553b9643d47924bf44e32238.zip | |
Always pass encodings='utf_8' to codecs.open(), since otherwise it can
return non-unicode strings (at least in some cases, observed with
python-2.6.2). Don't use unicode in portage.util.getconfig() for now,
since shlex doesn't seem to support it (spurious \0 characters). If we
use unicode for config variables, it breaks shlex.split() calls on those
variables due to the same issue (spurious \0 characters).
svn path=/main/trunk/; revision=13845
Diffstat (limited to 'bin/repoman')
| -rwxr-xr-x | bin/repoman | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/repoman b/bin/repoman index 3ea879c35..c8f32f4a4 100755 --- a/bin/repoman +++ b/bin/repoman @@ -590,7 +590,8 @@ for path in portdb.porttrees: desc_path = os.path.join(path, 'profiles', 'profiles.desc') try: - desc_file = codecs.open(desc_path, mode='r', errors='replace') + desc_file = codecs.open(desc_path, mode='r', + encoding='utf_8', errors='replace') except EnvironmentError: pass else: @@ -960,7 +961,8 @@ for x in scanlist: continue try: line = 1 - for l in codecs.open(checkdir+"/"+y, "r", "utf8"): + for l in codecs.open(os.path.join(checkdir, y), mode='r', + encoding='utf_8'): line +=1 except UnicodeDecodeError, ue: stats["file.UTF8"] += 1 |