Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r13915 - main/trunk/pym/portage
Date: Wed, 05 Aug 2009 00:17:18
Message-Id: E1MYUBw-0001Bl-8x@stork.gentoo.org
1 Author: zmedico
2 Date: 2009-08-05 00:17:15 +0000 (Wed, 05 Aug 2009)
3 New Revision: 13915
4
5 Modified:
6 main/trunk/pym/portage/__init__.py
7 Log:
8 Open ld.so.conf as text (unicode).
9
10
11 Modified: main/trunk/pym/portage/__init__.py
12 ===================================================================
13 --- main/trunk/pym/portage/__init__.py 2009-08-05 00:12:39 UTC (rev 13914)
14 +++ main/trunk/pym/portage/__init__.py 2009-08-05 00:17:15 UTC (rev 13915)
15 @@ -726,7 +726,8 @@
16
17 ldsoconf_path = os.path.join(target_root, "etc", "ld.so.conf")
18 try:
19 - myld = open(ldsoconf_path)
20 + myld = codecs.open(ldsoconf_path, mode='r',
21 + encoding='utf_8', errors='replace')
22 myldlines=myld.readlines()
23 myld.close()
24 oldld=[]