Merge pull request #31170 from rallytime/bp-31157

Back-port #31157 to 2015.8
saltstack · Feb 12, 2016 · f2efd3e · f2efd3e
2 parents 7f49fbb + 27776b5
commit f2efd3e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/salt/modules/localemod.py b/salt/modules/localemod.py
@@ -242,7 +242,7 @@ def gen_locale(locale, **kwargs):
     locale_info = salt.utils.locales.split_locale(locale)
 
     # if the charmap has not been supplied, normalize by appening it
-    if not locale_info['charmap']:
+    if not locale_info['charmap'] and not on_ubuntu:
         locale_info['charmap'] = locale_info['codeset']
         locale = salt.utils.locales.join_locale(locale_info)