ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-24 13:50:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Exposed backup file path, simplified result args (#5364)

Browse source 
Fixes #245
This commit is contained in:
Evan Kaufman 2016-10-24 07:42:01 -07:00 • committed by Matt Clay
commit 42079bcc59
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/ansible/modules/files/replace.py
View file

@ -130,7 +130,7 @@ def main():
params = module.params params = module.params
dest = os.path.expanduser(params['dest']) dest = os.path.expanduser(params['dest'])
diff = dict() res_args = dict()
if os.path.isdir(dest): if os.path.isdir(dest):
module.fail_json(rc=256, msg='Destination %s is a directory !' % dest) module.fail_json(rc=256, msg='Destination %s is a directory !' % dest)
@ -142,12 +142,6 @@ def main():
contents = f.read() contents = f.read()
f.close() f.close()
if module._diff:
diff = {
'before_header': dest,
'before': contents,
}
mre = re.compile(params['regexp'], re.MULTILINE) mre = re.compile(params['regexp'], re.MULTILINE)
result = re.subn(mre, params['replace'], contents, 0) result = re.subn(mre, params['replace'], contents, 0)
@ -155,22 +149,25 @@ def main():
msg = '%s replacements made' % result[1] msg = '%s replacements made' % result[1]
changed = True changed = True
if module._diff: if module._diff:
diff['after_header'] = dest res_args['diff'] = {
diff['after'] = result[0] 'before_header': dest,
'before': contents,
'after_header': dest,
'after': result[0],
}
else: else:
msg = '' msg = ''
changed = False changed = False
diff = dict()
if changed and not module.check_mode: if changed and not module.check_mode:
if params['backup'] and os.path.exists(dest): if params['backup'] and os.path.exists(dest):
module.backup_local(dest) res_args['backup_file'] = module.backup_local(dest)
if params['follow'] and os.path.islink(dest): if params['follow'] and os.path.islink(dest):
dest = os.path.realpath(dest) dest = os.path.realpath(dest)
write_changes(module, result[0], dest) write_changes(module, result[0], dest)
msg, changed = check_file_attrs(module, changed, msg) res_args['msg'], res_args['changed'] = check_file_attrs(module, changed, msg)
module.exit_json(changed=changed, msg=msg, diff=diff) module.exit_json(**res_args)
# this is magic, see lib/ansible/module_common.py # this is magic, see lib/ansible/module_common.py
from ansible.module_utils.basic import * from ansible.module_utils.basic import *