From 362626d07c2482d883403c498b74924a7dd7ec7f Mon Sep 17 00:00:00 2001 From: James Cammarata Date: Mon, 19 May 2014 23:04:13 -0500 Subject: [PATCH] Default use_proxy to True for fetch_url() Also added some error handling to the fetch_url() call in the apt_repository module, so that failures to look up the PPA info are properly handled. Fixes #7322 --- lib/ansible/module_utils/urls.py | 2 +- library/packaging/apt_repository | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/ansible/module_utils/urls.py b/lib/ansible/module_utils/urls.py index d80ea76bf80..15faadeb555 100644 --- a/lib/ansible/module_utils/urls.py +++ b/lib/ansible/module_utils/urls.py @@ -207,7 +207,7 @@ def url_argument_spec(): def fetch_url(module, url, data=None, headers=None, method=None, - use_proxy=False, force=False, last_mod_time=None, timeout=10): + use_proxy=True, force=False, last_mod_time=None, timeout=10): ''' Fetches a file from an HTTP/FTP server using urllib2 ''' diff --git a/library/packaging/apt_repository b/library/packaging/apt_repository index a33c5735a8a..e10d2c5492f 100644 --- a/library/packaging/apt_repository +++ b/library/packaging/apt_repository @@ -320,6 +320,8 @@ class UbuntuSourcesList(SourcesList): headers = dict(Accept='application/json') response, info = fetch_url(self.module, lp_api, headers=headers) + if info['status'] != 200: + self.module.fail_json(msg="failed to fetch PPA information, error was: %s" % info['msg']) return json.load(response) def _expand_ppa(self, path):