Don't stacktrace when trying to get the default locale.

Fixes saltstack#26063
s0undt3ch · Aug 6, 2015 · 8c6ab78 · 8c6ab78
1 parent 0f44761
commit 8c6ab78
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/salt/__init__.py b/salt/__init__.py
@@ -39,7 +39,12 @@ def __define_global_system_encoding_variable__():
         # encoding. MS Windows has problems with this and reports the wrong
         # encoding
         import locale
-        encoding = locale.getdefaultlocale()[-1]
+        try:
+            encoding = locale.getdefaultlocale()[-1]
+        except ValueError:
+            # A bad locale setting was most likely found:
+            #   https://github.com/saltstack/salt/issues/26063
+            pass
 
         # This is now garbage collectable
         del locale