diff options
| author | Martin Braun <martin.braun@ettus.com> | 2020-05-21 16:54:56 -0700 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2020-05-27 09:44:40 -0500 |
| commit | 09309130934244971405e97c725b59b89a8111c4 (patch) | |
| tree | 6bd344750f87b5f0144443bed380db40c5b42ab6 /host | |
| parent | 5b3d66e5b7cedb7098de3e4dbbee70af04a3626e (diff) | |
| download | uhd-09309130934244971405e97c725b59b89a8111c4.tar.gz uhd-09309130934244971405e97c725b59b89a8111c4.tar.bz2 uhd-09309130934244971405e97c725b59b89a8111c4.zip | |
utils: Let uhd_images_downloader also use HTTPS proxies
This complements b721621. In that commit, we directly go to HTTPS, but
in either case (direct or indirect) the --http-proxy command line
argument did not use the proxy for https.
Diffstat (limited to 'host')
| -rw-r--r-- | host/utils/uhd_images_downloader.py.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/host/utils/uhd_images_downloader.py.in b/host/utils/uhd_images_downloader.py.in index de74d37e2..4d04342c1 100644 --- a/host/utils/uhd_images_downloader.py.in +++ b/host/utils/uhd_images_downloader.py.in @@ -120,10 +120,10 @@ def parse_args(): "larger than this will require approval, either " "interactively, or by providing --yes.") parser.add_argument("--http-proxy", type=str, - help="Specify HTTP proxy in the format " - "http://user:pass@1.2.3.4:port\n" + help="Specify HTTP(S) proxy in the format " + "http[s]://user:pass@1.2.3.4:port\n" "If this this option is not given, the environment " - "variable HTTP_PROXY can also be used to specify a proxy.") + "variables HTTP_PROXY/HTTPS_PROXY can also be used to specify a proxy.") parser.add_argument("-b", "--base-url", type=str, help="Set base URL for images download location. " "Defaults to ${} if set, or {} otherwise.".format( @@ -163,6 +163,7 @@ def parse_args(): if args.http_proxy: global _PROXIES _PROXIES['http'] = args.http_proxy + _PROXIES['https'] = args.http_proxy return args |