cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixup args being passed into file from copy, tweak preservation of changed attribute.

Browse source
This commit is contained in:
Michael DeHaan 2012-07-23 21:55:41 -04:00
parent 2cda36f7dc
commit dd6399b5ae
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/runner/__init__.py
View file

@ -317,8 +317,8 @@ class Runner(object):
conn.put_file(source, tmp_src) conn.put_file(source, tmp_src)
# run the copy module # run the copy module
args = "src=%s dest=%s" % (tmp_src, dest) self.module_args = "src=%s dest=%s" % (tmp_src, dest)
return self._execute_module(conn, tmp, 'copy', args, inject=inject).daisychain('file') return self._execute_module(conn, tmp, 'copy', self.module_args, inject=inject).daisychain('file')
else: else:
# no need to transfer the file, already correct md5 # no need to transfer the file, already correct md5
@ -571,7 +571,9 @@ class Runner(object):
if 'daisychain_args' in result.result: if 'daisychain_args' in result.result:
self.module_args = result.result['daisychain_args'] self.module_args = result.result['daisychain_args']
result2 = self._executor_internal_inner(host, inject, port) 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.update(result2.result)
result.result['changed'] = changed result.result['changed'] = changed
del result.result['daisychain'] del result.result['daisychain']