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

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)
pull/782/head
Michael DeHaan 14 years ago
parent 7e9e29011e
commit 08c1f96e4b

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

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

Loading…
Cancel
Save