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

fix locale detection in debian/gentoo

Browse source
This commit is contained in:
Andreas Lutro 2015-07-23 12:57:16 +02:00
parent 00f4689fe3
commit e58d222fb0
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/modules/localemod.py
View file

@ -259,13 +259,17 @@ def gen_locale(locale, **kwargs):
locale_info = _split_locale(locale)
if on_debian or on_gentoo: # file-based search
search = '/usr/share/i18n/SUPPORTED'
valid = __salt__['file.search'](search, '^{0}$'.format(locale))
path = '/usr/share/i18n/SUPPORTED'
def search_locale():
return __salt__['file.search'](path,
'^{0}$'.format(locale),
flags=re.MULTILINE)
valid = search_locale()
if not valid and not locale_info['charmap']:
# charmap was not supplied, so try copying the codeset
locale_info['charmap'] = locale_info['codeset']
locale = _join_locale(locale_info)
valid = __salt__['file.search'](search, '^{0}$'.format(locale))
valid = search_locale()
else: # directory-based search
if on_suse:
search = '/usr/share/locale'