valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

expect the new exception that can be thrown and handle it

Browse Source
This commit is contained in:
Jorge Schrauwen 2016-01-25 19:41:57 +00:00
parent 4d2fa2e2aa
commit ead9fce6b1
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
salt/states/locale.py
View File

@ -18,6 +18,11 @@ Manage the available locales and the system default:
- locale: us_locale
'''
from __future__ import absolute_import
# Import salt libs
from salt.exceptions import CommandNotFoundError
def __virtual__():
'''
@ -37,21 +42,26 @@ def system(name):
'changes': {},
'result': None,
'comment': ''}
if __salt__['locale.get_locale']() == name:
ret['result'] = True
ret['comment'] = 'System locale {0} already set'.format(name)
return ret
if __opts__['test']:
ret['comment'] = 'System locale {0} needs to be set'.format(name)
return ret
if __salt__['locale.set_locale'](name):
ret['changes'] = {'locale': name}
ret['result'] = True
ret['comment'] = 'Set system locale {0}'.format(name)
return ret
else:
try:
if __salt__['locale.get_locale']() == name:
ret['result'] = True
ret['comment'] = 'System locale {0} already set'.format(name)
return ret
if __opts__['test']:
ret['comment'] = 'System locale {0} needs to be set'.format(name)
return ret
if __salt__['locale.set_locale'](name):
ret['changes'] = {'locale': name}
ret['result'] = True
ret['comment'] = 'Set system locale {0}'.format(name)
return ret
else:
ret['result'] = False
ret['comment'] = 'Failed to set system locale to {0}'.format(name)
return ret
except CommandNotFoundError as err:
ret['result'] = False
ret['comment'] = 'Failed to set system locale to {0}'.format(name)
ret['comment'] = 'Failed to set sysstem locale: {0}'.format(err)
return ret