wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for #31477: return 'dest' from copy when file wasn't changed

Browse source 
(cherry picked from commit 89ad40b129)
This commit is contained in:
Tomasz Kontusz 2018-02-04 12:58:35 +01:00 committed by Toshio Kuratomi
parent 3c4d6a25ed
commit 0ac4722b29
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/plugins/action/copy.py
View file

@ -566,17 +566,13 @@ class ActionModule(ActionBase):
changed = changed or module_return.get('changed', False) changed = changed or module_return.get('changed', False)
# the file module returns the file path as 'path', but
# the copy module uses 'dest', so add it if it's not there
if 'path' in module_return and 'dest' not in module_return:
module_return['dest'] = module_return['path']
# Delete tmp path if we were recursive or if we did not execute a module.
if not delete_remote_tmp or (delete_remote_tmp and not module_executed):
self._remove_tmp_path(tmp)
if module_executed and len(source_files['files']) == 1: if module_executed and len(source_files['files']) == 1:
result.update(module_return) result.update(module_return)
# the file module returns the file path as 'path', but
# the copy module uses 'dest', so add it if it's not there
if 'path' in result and 'dest' not in result:
result['dest'] = result['path']
else: else:
result.update(dict(dest=dest, src=source, changed=changed)) result.update(dict(dest=dest, src=source, changed=changed))