refactor: Move --set-env processing after IO initialization

This commit is contained in:
Paul Gauthier 2024-12-07 08:09:52 -08:00 committed by Paul Gauthier (aider)
parent af3d8dd6a7
commit 054e0820b7

View file

@ -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):