From 2cdb3fa40319824e398bbec039d13ba6852b83db Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 26 Apr 2023 16:13:26 +0200 Subject: [PATCH] Don't filter the proxy settings being passed to curl env_proxy_settings() DTRT by default with no arguments. Passing 'https' as an argument just causes it to FAIL to honor no_proxy in the environment which it should. --- charmhelpers/fetch/ubuntu.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charmhelpers/fetch/ubuntu.py b/charmhelpers/fetch/ubuntu.py index effc884ad..66eee83ed 100644 --- a/charmhelpers/fetch/ubuntu.py +++ b/charmhelpers/fetch/ubuntu.py @@ -591,7 +591,7 @@ def _get_key_by_keyid(keyid): curl_cmd = ['curl', keyserver_url.format(keyid)] # use proxy server settings in order to retrieve the key return subprocess.check_output(curl_cmd, - env=env_proxy_settings(['https'])) + env=env_proxy_settings()) def _dearmor_gpg_key(key_asc):