]> granicus.if.org Git - python/commitdiff
Merged revisions 84836 via svnmerge from
authorMatthias Klose <doko@ubuntu.com>
Wed, 15 Sep 2010 13:08:12 +0000 (13:08 +0000)
committerMatthias Klose <doko@ubuntu.com>
Wed, 15 Sep 2010 13:08:12 +0000 (13:08 +0000)
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84836 | matthias.klose | 2010-09-15 15:06:09 +0200 (Mi, 15 Sep 2010) | 3 lines

  Try harder on issue #7356: ctypes.util: Make parsing of ldconfig output
  independent of the locale. Set LC_ALL=C too.
........

Lib/ctypes/util.py

index 58b0d732f8dae1578ca1fa331e5600cabd59fda8..52bc29614c620be74c9b8512a81929bc033357e6 100644 (file)
@@ -219,7 +219,7 @@ elif os.name == "posix":
             # XXX assuming GLIBC's ldconfig (with option -p)
             expr = r'(\S+)\s+\((%s(?:, OS ABI:[^\)]*)?)\)[^/]*(/[^\(\)\s]*lib%s\.[^\(\)\s]*)' \
                    % (abi_type, re.escape(name))
-            f = os.popen('LANG=C /sbin/ldconfig -p 2>/dev/null')
+            f = os.popen('LC_ALL=C LANG=C /sbin/ldconfig -p 2>/dev/null')
             try:
                 data = f.read()
             finally: