summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-08-05 00:17:15 +0000
committerZac Medico <zmedico@gentoo.org>2009-08-05 00:17:15 +0000
commit12858b85d18755100b340524126598180a42e8c7 (patch)
tree079a6bbc8ca30d7ffd88d716a6743597c91ee290 /pym
parent8f29114a94e480a13b232ac2119b398902b54492 (diff)
downloadportage-12858b85d18755100b340524126598180a42e8c7.tar.gz
portage-12858b85d18755100b340524126598180a42e8c7.tar.bz2
portage-12858b85d18755100b340524126598180a42e8c7.zip
Open ld.so.conf as text (unicode).
svn path=/main/trunk/; revision=13915
Diffstat (limited to 'pym')
-rw-r--r--pym/portage/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index eb7547c30..ca2764335 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -726,7 +726,8 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None, contents=None,
ldsoconf_path = os.path.join(target_root, "etc", "ld.so.conf")
try:
- myld = open(ldsoconf_path)
+ myld = codecs.open(ldsoconf_path, mode='r',
+ encoding='utf_8', errors='replace')
myldlines=myld.readlines()
myld.close()
oldld=[]