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

Merge pull request #1047 from lotia/get_url_require_thirsty_if_dest_is_dir

Browse source 
Make get_url module always return dest.
This commit is contained in:
Michael DeHaan 2012-09-14 15:38:08 -07:00
commit 70777f044d
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
library/get_url
View file

@ -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)