From 27776b5f4e4cead2b67c6eb64d769780f053ba9d Mon Sep 17 00:00:00 2001 From: Captain Inspiration Date: Fri, 12 Feb 2016 14:25:01 +0100 Subject: [PATCH] Fix locale generation on Ubuntu --- salt/modules/localemod.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/modules/localemod.py b/salt/modules/localemod.py index 5070175b3d53..6874611901c2 100644 --- 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)