From 4d1abca2fc2e29be287e8a7f73854b2e9171abc1 Mon Sep 17 00:00:00 2001 From: jaimergp Date: Thu, 3 Oct 2024 12:12:32 +0200 Subject: [PATCH] Respect original ssl_verify values (#860) * pass ssl_verify as env var * add news * assert context items were kept * first item --- constructor/fcp.py | 10 ++++++---- news/860-ssl-verify | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 4 deletions(-) create mode 100644 news/860-ssl-verify diff --git a/constructor/fcp.py b/constructor/fcp.py index 96b191b36..e6f66dfa1 100644 --- a/constructor/fcp.py +++ b/constructor/fcp.py @@ -451,16 +451,18 @@ def main(info, verbose=True, dry_run=False, conda_exe="conda.exe"): # We need to preserve the configuration for proxy servers and ssl, otherwise if constructor is # running in a host that sits behind proxy (usually in a company / corporate environment) it # will have this settings reset with the call to conda_replace_context_default + # We can pass ssl_verify via env var, but proxy_servers is a mapping so we need to do it by hand # See: https://github.com/conda/constructor/issues/304 proxy_servers = conda_context.proxy_servers - ssl_verify = conda_context.ssl_verify - + _ssl_verify = conda_context.ssl_verify with env_vars({ "CONDA_PKGS_DIRS": download_dir, + "CONDA_SSL_VERIFY": str(conda_context.ssl_verify), }, conda_replace_context_default): - # Restoring the state for both "proxy_servers" and "ssl_verify" to what was before + # Restoring the state for "proxy_servers" to what it was before conda_context.proxy_servers = proxy_servers - conda_context.ssl_verify = ssl_verify + assert conda_context.ssl_verify == _ssl_verify + assert conda_context.pkgs_dirs and conda_context.pkgs_dirs[0] == download_dir ( pkg_records, diff --git a/news/860-ssl-verify b/news/860-ssl-verify new file mode 100644 index 000000000..2bb2e4000 --- /dev/null +++ b/news/860-ssl-verify @@ -0,0 +1,19 @@ +### Enhancements + +* + +### Bug fixes + +* Respect `ssl_verify` setting if defined in any `condarc` file. (#851 via #860) + +### Deprecations + +* + +### Docs + +* + +### Other + +*