From dd6399b5aeac248fac6a884f60306e5b536642e6 Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Mon, 23 Jul 2012 21:55:41 -0400 Subject: [PATCH] Fixup args being passed into file from copy, tweak preservation of changed attribute. --- lib/ansible/runner/__init__.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/ansible/runner/__init__.py b/lib/ansible/runner/__init__.py index 893e826395..2dfad463d3 100644 --- a/lib/ansible/runner/__init__.py +++ b/lib/ansible/runner/__init__.py @@ -317,8 +317,8 @@ class Runner(object): conn.put_file(source, tmp_src) # run the copy module - args = "src=%s dest=%s" % (tmp_src, dest) - return self._execute_module(conn, tmp, 'copy', args, inject=inject).daisychain('file') + self.module_args = "src=%s dest=%s" % (tmp_src, dest) + return self._execute_module(conn, tmp, 'copy', self.module_args, inject=inject).daisychain('file') else: # no need to transfer the file, already correct md5 @@ -571,7 +571,9 @@ class Runner(object): if 'daisychain_args' in result.result: self.module_args = result.result['daisychain_args'] result2 = self._executor_internal_inner(host, inject, port) - changed = result.result.get('changed',False) or result2.result.get('changed',False) + changed = False + if result.result.get('changed',False) or result2.result.get('changed',False): + changed = True result.result.update(result2.result) result.result['changed'] = changed del result.result['daisychain']