cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

added backup_file to module returns (#4723)

Browse source 
fixes #14502
also cleaned up some unused stuff and fixed imports
This commit is contained in:
Brian Coca 2016-09-07 12:18:33 -04:00 committed by GitHub
parent db38f0c876
commit 1d4c0abe29
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
files/ini_file.py
View file

@ -101,9 +101,8 @@ EXAMPLES = '''
backup=yes backup=yes
''' '''
import ConfigParser
import sys
import os import os
import re
# ============================================================== # ==============================================================
# match_opt # match_opt
@ -199,16 +198,17 @@ def do_ini(module, filename, section=None, option=None, value=None, state='prese
changed = True changed = True
backup_file = None
if changed and not module.check_mode: if changed and not module.check_mode:
if backup: if backup:
module.backup_local(filename) backup_file = module.backup_local(filename)
ini_file = open(filename, 'w') ini_file = open(filename, 'w')
try: try:
ini_file.writelines(ini_lines) ini_file.writelines(ini_lines)
finally: finally:
ini_file.close() ini_file.close()
return changed return (changed, backup_file)
# ============================================================== # ==============================================================
# main # main
@ -229,8 +229,6 @@ def main():
supports_check_mode = True supports_check_mode = True
) )
info = dict()
dest = os.path.expanduser(module.params['dest']) dest = os.path.expanduser(module.params['dest'])
section = module.params['section'] section = module.params['section']
option = module.params['option'] option = module.params['option']
@ -239,13 +237,17 @@ def main():
backup = module.params['backup'] backup = module.params['backup']
no_extra_spaces = module.params['no_extra_spaces'] no_extra_spaces = module.params['no_extra_spaces']
changed = do_ini(module, dest, section, option, value, state, backup, no_extra_spaces) (changed,backup_file) = do_ini(module, dest, section, option, value, state, backup, no_extra_spaces)
file_args = module.load_file_common_arguments(module.params) file_args = module.load_file_common_arguments(module.params)
changed = module.set_fs_attributes_if_different(file_args, changed) changed = module.set_fs_attributes_if_different(file_args, changed)
results = { 'changed': changed, 'msg': "OK", 'dest': dest }
if backup_file is not None:
results['backup_file'] = backup_file
# Mission complete # Mission complete
module.exit_json(dest=dest, changed=changed, msg="OK") module.exit_json(**results)
# import module snippets # import module snippets
from ansible.module_utils.basic import * from ansible.module_utils.basic import *