a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
pull/4420/head
James Cammarata 2014-05-19 23:04:13 -05:00
parent 08406c0ee2
commit d44ed533b3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ansible/module_utils/urls.py
View File

@ -291,7 +291,7 @@ def url_argument_spec():
def fetch_url(module, url, data=None, headers=None, method=None, 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 Fetches a file from an HTTP/FTP server using urllib2
''' '''

2
library/packaging/apt_repository
View File

@ -320,6 +320,8 @@ class UbuntuSourcesList(SourcesList):
headers = dict(Accept='application/json') headers = dict(Accept='application/json')
response, info = fetch_url(self.module, lp_api, headers=headers) 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) return json.load(response)
def _expand_ppa(self, path): def _expand_ppa(self, path):