ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-27 10:40:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix some subtle behavior of how the get_url module chains into the file module, plus blend the results of daisy chain

Browse source 
operations in the correct order, so the file module results overlay the original module results, not the other way
around (which keeps any failure msg's intact)
This commit is contained in:
Michael DeHaan 2012-08-03 07:02:31 -04:00
parent 7e9e29011e
commit 08c1f96e4b
2 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -587,9 +587,9 @@ class Runner(object):
changed = False changed = False
if result.result.get('changed',False) or result2.result.get('changed',False): if result.result.get('changed',False) or result2.result.get('changed',False):
changed = True changed = True
result2.result.update(result.result) result.result.update(result2.result)
result2.result['changed'] = changed result.result['changed'] = changed
result = result2
del result.result['daisychain'] del result.result['daisychain']
self._delete_remote_files(conn, tmp) self._delete_remote_files(conn, tmp)

2
library/get_url
View file

@ -64,6 +64,8 @@ def url_do_get(module, url, dest):
else: else:
actualdest = dest actualdest = dest
info['daisychain_args'] = module.params info['daisychain_args'] = module.params
info['daisychain_args']['state'] = 'file'
info['daisychain_args']['dest'] = actualdest
info['actualdest'] = actualdest info['actualdest'] = actualdest
request = urllib2.Request(url) request = urllib2.Request(url)