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

pep8 fixes

Browse source
This commit is contained in:
Joe Julian 2015-09-01 15:51:06 -07:00
parent 6108ec4280
commit a9928cb143
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
salt/modules/localemod.py
View file

@ -37,6 +37,7 @@ def __virtual__():
return __virtualname__
def _uses_dbus():
if 'Arch' in __grains__['os_family']:
return True
@ -47,6 +48,7 @@ def _uses_dbus():
elif 'Gentoo' in __grains__['os_family']:
return False
def _parse_dbus_locale():
'''
Get the 'System Locale' parameters from dbus
@ -250,7 +252,7 @@ def avail(locale):
return False
avail_locales = __salt__['locale.list_avail']()
locale_exists = next((True for x in avail_locales
if _normalize_locale(x.strip()) == normalized_locale), False)
if _normalize_locale(x.strip()) == normalized_locale), False)
return locale_exists
@ -303,10 +305,12 @@ def gen_locale(locale, **kwargs):
locale_info['territory']) in os.listdir(search)
except OSError, ex:
log.error(ex)
raise CommandExecutionError("Locale \"{0}\" is not available.".format(locale))
raise CommandExecutionError(
"Locale \"{0}\" is not available.".format(locale))
if not valid:
log.error('The provided locale "{0}" is not found in {1}'.format(locale, search))
log.error(
'The provided locale "{0}" is not found in {1}'.format(locale, search))
return False
if os.path.exists('/etc/locale.gen'):
@ -334,7 +338,8 @@ def gen_locale(locale, **kwargs):
cmd.append(locale)
elif salt.utils.which("localedef") is not None:
cmd = ['localedef', '--force',
'-i', "{0}_{1}".format(locale_info['language'], locale_info['territory']),
'-i', "{0}_{1}".format(locale_info['language'],
locale_info['territory']),
'-f', locale_info['codeset'],
locale]
cmd.append(kwargs.get('verbose', False) and '--verbose' or '--quiet')