From ef2df8157ac3aa85eb2cdc2f40b733afc538de71 Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Wed, 19 Feb 2014 16:31:19 -0500 Subject: [PATCH] Fixup result dictionary when copy module calls file module --- lib/ansible/runner/action_plugins/copy.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/ansible/runner/action_plugins/copy.py b/lib/ansible/runner/action_plugins/copy.py index d76c72185d..0ee9b6f3ce 100644 --- a/lib/ansible/runner/action_plugins/copy.py +++ b/lib/ansible/runner/action_plugins/copy.py @@ -258,6 +258,8 @@ class ActionModule(object): module_executed = True module_result = module_return.result + if not module_result.get('md5sum'): + module_result['md5sum'] = local_md5 if module_result.get('failed') == True: return module_return if module_result.get('changed') == True: @@ -268,6 +270,11 @@ class ActionModule(object): or (not C.DEFAULT_KEEP_REMOTE_FILES and delete_remote_tmp and not module_executed): self.runner._remove_tmp_path(conn, tmp_path) + # 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_result and 'dest' not in module_result: + module_result['dest'] = module_result['path'] + # TODO: Support detailed status/diff for multiple files if len(source_files) == 1: result = module_result