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 #34245 ini.options_present reporting changes

Browse source
This commit is contained in:
m03 2017-06-11 17:22:35 -07:00 • committed by rallytime
parent 7d385f8bdc
commit ee4ea6b860
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/states/ini_manage.py
View file

@ -86,8 +86,9 @@ def options_present(name, sections=None, separator='=', strict=False):
changes[section_name].update({key_to_remove: ''})
changes[section_name].update({key_to_remove: {'before': orig_value,
'after': None}})
changes[section_name].update(
__salt__['ini.set_option'](name, {section_name: section_body}, separator)[section_name])
options_updated = __salt__['ini.set_option'](name, {section_name: section_body}, separator)
if options_updated:
changes[section_name].update(options_updated[section_name])
else:
changes = __salt__['ini.set_option'](name, sections, separator)
except IOError as err:
@ -99,8 +100,12 @@ def options_present(name, sections=None, separator='=', strict=False):
ret['comment'] = 'Errors encountered. {0}'.format(changes['error'])
ret['changes'] = {}
else:
ret['comment'] = 'Changes take effect'
ret['changes'] = changes
if all(value == {} for value in changes.values()):
ret['changes'] = {}
ret['comment'] = 'No changes take effect'
else:
ret['changes'] = changes
ret['comment'] = 'Changes take effect'
return ret