a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes #4653 Set dest on results for copy module even if using file module

pull/4420/head
James Tanner 2013-10-28 22:50:55 -04:00
parent 36c23cd895
commit 0faecdf7d1
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ansible/runner/action_plugins/copy.py
View File

@ -174,7 +174,9 @@ class ActionModule(object):
module_args = "%s src=%s" % (module_args, pipes.quote(tmp_src)) module_args = "%s src=%s" % (module_args, pipes.quote(tmp_src))
if self.runner.noop_on_check(inject): if self.runner.noop_on_check(inject):
module_args = "%s CHECKMODE=True" % module_args module_args = "%s CHECKMODE=True" % module_args
return self.runner._execute_module(conn, tmp, 'file', module_args, inject=inject, complex_args=complex_args) results = self.runner._execute_module(conn, tmp, 'file', module_args, inject=inject, complex_args=complex_args)
results = self._result_key_merge(options, results)
return results
def _get_diff_data(self, conn, tmp, inject, destination, source): def _get_diff_data(self, conn, tmp, inject, destination, source):
peek_result = self.runner._execute_module(conn, tmp, 'file', "path=%s diff_peek=1" % destination, inject=inject, persist_files=True) peek_result = self.runner._execute_module(conn, tmp, 'file', "path=%s diff_peek=1" % destination, inject=inject, persist_files=True)
@ -213,3 +215,10 @@ class ActionModule(object):
diff['after'] = src.read() diff['after'] = src.read()
return diff return diff
def _result_key_merge(self, options, results):
# add keys to file module results to mimic copy
if 'path' in results.result and 'dest' not in results.result:
results.result['dest'] = results.result['path']
del results.result['path']
return results