From 16dc1eb933fb8579d6299cf9a2737831326e6284 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 10 Sep 2019 14:47:40 +1200 Subject: [PATCH] dockersetup: allow updating if proxy config set in environment Don't confuse proxy options being defaulted through from the environment and the user explicitly specifying them. Also look at no_proxy option. Fixes https://github.com/intel/clear-linux-dissector-web/issues/13 Signed-off-by: Paul Eggleton --- dockersetup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockersetup.py b/dockersetup.py index e77b4ba..6e63284 100755 --- a/dockersetup.py +++ b/dockersetup.py @@ -69,7 +69,7 @@ def get_args(): args = parser.parse_args() if args.update: - if args.http_proxy or args.https_proxy or args.databasefile or args.no_https or args.cert or args.cert_key or args.letsencrypt: + if args.http_proxy != default_http_proxy or args.https_proxy != default_https_proxy or args.no_proxy != default_no_proxy or args.databasefile or args.no_https or args.cert or args.cert_key or args.letsencrypt: raise argparse.ArgumentTypeError("The -u/--update option will not update configuration or database content, and thus none of the other configuration options can be used in conjunction with it") if args.reinstall: raise argparse.ArgumentTypeError("The -u/--update and -r/--reinstall options are mutually exclusive")