Merge pull request #25290 from pcdummy/locale-gen_fix

Simple fix for locale.present on Ubuntu.
This commit is contained in:
Justin Findlay 2015-07-09 09:18:02 -06:00
commit a3e209d538

View file

@ -252,8 +252,7 @@ def gen_locale(locale, **kwargs):
cmd = ['locale-gen']
if on_gentoo:
cmd.append('--generate')
if not on_ubuntu:
cmd.append(locale)
cmd.append(locale)
elif salt.utils.which("localedef") is not None:
cmd = ['localedef', '--force',
'-i', "{0}_{1}".format(locale_info['language'], locale_info['territory']),