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 indent change

Browse source
This commit is contained in:
Joe Julian 2015-09-01 13:06:16 -07:00
parent 0a35320aa7
commit c1c1266cc3
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
salt/modules/localemod.py
View file

@ -41,15 +41,17 @@ def _parse_localectl():
'/org/freedesktop/locale1')
properties = dbus.Interface(localed, 'org.freedesktop.DBus.Properties')
system_locale = properties.Get('org.freedesktop.locale1', 'Locale')
try:
key, val = re.match('^([A-Z_]+)=(.*)$', system_locale[0]).groups()
except AttributeError:
log.error('Odd locale parameter "{0}" detected in dbus locale '
'output. This should not happen. You should '
'probably investigate what caused this.'.format(
system_locale[0]))
else:
ret[key] = val.replace('"', '')
try:
key, val = re.match('^([A-Z_]+)=(.*)$', system_locale[0]).groups()
except AttributeError:
log.error('Odd locale parameter "{0}" detected in dbus locale '
'output. This should not happen. You should '
'probably investigate what caused this.'.format(
system_locale[0]))
else:
ret[key] = val.replace('"', '')
return ret