summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDag Wieers <dag@wieers.com>2016-11-18 14:36:31 +0100
committerToshio Kuratomi <a.badger@gmail.com>2016-11-21 12:54:30 -0800
commit7f1af990691bb15e286b6b9e5195d812f3b761dd (patch)
tree21e73d7f9270c82ed5da36f03328cd9d67960a14
parent36121c5404de7dd099833aedda455b4d3321d24b (diff)
downloadansible-modules-core-7f1af990691bb15e286b6b9e5195d812f3b761dd.tar.gz
Ensure proper error when fetch_url returns status -1
When using a file:// or ftp:// URL the normal provisions that a non-200 status code means error have been disabled. But the common error status -1 from fetch_url is not properly returning an error message. This fix ensures that if the status code returns -1, we return a proper error message. This fixes #3563 (cherry picked from commit 7903b39fc0c1e7559c98b838e4da5bc157a24412)
-rw-r--r--network/basics/get_url.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/network/basics/get_url.py b/network/basics/get_url.py
index c59161f5..9cb55560 100644
--- a/network/basics/get_url.py
+++ b/network/basics/get_url.py
@@ -206,10 +206,14 @@ def url_get(module, url, dest, use_proxy, last_mod_time, force, timeout=10, head
if info['status'] == 304:
module.exit_json(url=url, dest=dest, changed=False, msg=info.get('msg', ''))
- # create a temporary file and copy content to do checksum-based replacement
+ # Exceptions in fetch_url may result in a status -1, the ensures a proper error to the user in all cases
+ if info['status'] == -1:
+ module.fail_json(msg=info['msg'], url=url, dest=dest)
+
if info['status'] != 200 and not url.startswith('file:/') and not (url.startswith('ftp:/') and info.get('msg', '').startswith('OK')):
module.fail_json(msg="Request failed", status_code=info['status'], response=info['msg'], url=url, dest=dest)
+ # create a temporary file and copy content to do checksum-based replacement
if tmp_dest != '':
# tmp_dest should be an existing dir
tmp_dest_is_dir = os.path.isdir(tmp_dest)