Indicate thirsty argument required if dest is dir.

The check for the destination being a directory is now done before
checking if the file exists, that way the user is informed that the
thirsty argument is required.
This commit is contained in:
Ali Asad Lotia 2012-09-14 08:02:30 +01:00
parent 9b3ad14aee
commit 6867d9730e

View file

@ -145,11 +145,10 @@ def main():
thirsty = module.boolean(module.params['thirsty'])
if not thirsty:
if os.path.exists(dest):
module.exit_json(msg="file already exists", changed=False)
if os.path.isdir(dest):
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", changed=False)
# download to tmpsrc
tmpsrc, info = url_get(module, url, dest)