[SCons] Always allow 'conda' layout when using 'package_build'

This commit is contained in:
Ray Speth 2023-08-17 23:05:16 -04:00 committed by Ingmar Schoegl
parent 08c1f84071
commit 2e5cd59741

View File

@ -2050,7 +2050,7 @@ if conda_prefix is not None and sys.executable.startswith(str(conda_prefix)):
env["prefix"] = conda_prefix.resolve().as_posix()
logger.info(
f"Using conda environment as default 'prefix': {env['prefix']}")
elif env["layout"] == "conda":
elif env["layout"] == "conda" and not env["package_build"]:
logger.error("Layout option 'conda' requires a conda environment.")
sys.exit(1)