Commit e155bcdd authored by tony@chromium.org's avatar tony@chromium.org

Fix an exception raised when trying to gclient sync on a Mac

with python 2.5.1.

Traceback (most recent call last):
  File "/Users/tc/depot_tools/gclient.py", line 1270, in <module>
    fix_encoding.fix_encoding()
  File "/Users/tc/depot_tools/fix_encoding.py", line 350, in fix_encoding
    ret &= fix_default_encoding()
  File "/Users/tc/depot_tools/fix_encoding.py", line 51, in
fix_default_encoding
    lang = locale.getlocale(aref)[0]
  File
"/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/locale.py",
line 460, in getlocale
    return _parse_localename(localename)
  File
"/System/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/locale.py",
line 373, in _parse_localename
    raise ValueError, 'unknown locale: %s' % localename
ValueError: unknown locale: C/UTF-8/C/C/C/C

R=dpranke@chromium.org,chase@chromium.org,bradnelson@google.com,maruel@chromium.org,evan@chromium.org,nsylvain@chromium.org,nsylvain@google.com
Review URL: http://codereview.chromium.org/6730008

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@79213 0039d316-1c4b-4281-b951-d872f2087c98
parent 972c6acd
...@@ -49,7 +49,7 @@ def fix_default_encoding(): ...@@ -49,7 +49,7 @@ def fix_default_encoding():
locale.setlocale(aref, '') locale.setlocale(aref, '')
try: try:
lang = locale.getlocale(aref)[0] lang = locale.getlocale(aref)[0]
except TypeError: except (TypeError, ValueError):
lang = None lang = None
if lang: if lang:
try: try:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment