saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #25327 from rallytime/bp-25290

Browse source 
Back-port #25290 to 2015.5
This commit is contained in:
Justin Findlay 2015-07-10 12:49:37 -06:00
commit 28450d124e
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/modules/localemod.py
View file

@ -304,8 +304,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']),