Merge pull request #1047 from lotia/get_url_require_thirsty_if_dest_is_dir

Make get_url module always return dest.
pull/1038/merge
Michael DeHaan 12 years ago
commit 70777f044d

@ -145,11 +145,10 @@ def main():
thirsty = module.boolean(module.params['thirsty']) thirsty = module.boolean(module.params['thirsty'])
if not thirsty: if not thirsty:
if os.path.exists(dest):
module.exit_json(msg="file already exists", changed=False)
if os.path.isdir(dest): if os.path.isdir(dest):
module.fail_json(msg="non-thirsty mode needs a filename for a destination, not a directory") module.fail_json(msg="non-thirsty mode needs a filename for a destination, not a directory")
if os.path.exists(dest):
module.exit_json(msg="file already exists", dest=dest, url=url, changed=False)
# download to tmpsrc # download to tmpsrc
tmpsrc, info = url_get(module, url, dest) tmpsrc, info = url_get(module, url, dest)

Loading…
Cancel
Save