From 054e0820b74b30dd6912073c93a46f6b849c04f5 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Sat, 7 Dec 2024 08:09:52 -0800 Subject: [PATCH] refactor: Move --set-env processing after IO initialization --- aider/main.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/aider/main.py b/aider/main.py index 5d3371810..5de7ff1ed 100644 --- a/aider/main.py +++ b/aider/main.py @@ -461,17 +461,6 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F analytics = Analytics(permanently_disable=True) print("Analytics have been permanently disabled.") - # Process any environment variables set via --set-env - if args.set_env: - for env_setting in args.set_env: - try: - name, value = env_setting.split("=", 1) - os.environ[name.strip()] = value.strip() - except ValueError: - io.tool_error(f"Invalid --set-env format: {env_setting}") - io.tool_output("Format should be: ENV_VAR_NAME=value") - return 1 - if not args.verify_ssl: import httpx @@ -537,6 +526,17 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F io = get_io(False) io.tool_warning("Terminal does not support pretty output (UnicodeDecodeError)") + # Process any environment variables set via --set-env + if args.set_env: + for env_setting in args.set_env: + try: + name, value = env_setting.split("=", 1) + os.environ[name.strip()] = value.strip() + except ValueError: + io.tool_error(f"Invalid --set-env format: {env_setting}") + io.tool_output("Format should be: ENV_VAR_NAME=value") + return 1 + analytics = Analytics(logfile=args.analytics_log, permanently_disable=args.analytics_disable) if args.analytics is not False: if analytics.need_to_ask(args.analytics):