From f64a36c44c50605d942d03e99d679cf86b57c5ff Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Fri, 22 Feb 2019 11:20:58 +0100
Subject: [PATCH] [build] Do not overwrite conda-build root dir if already
configured
The condarc file can contain the root-dir entry which state where
conda-build should run and store its artifacts. Don't set croot
if that setting is found.
---
bob/devtools/build.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/bob/devtools/build.py b/bob/devtools/build.py
index 7ad4acb6..a392c563 100644
--- a/bob/devtools/build.py
+++ b/bob/devtools/build.py
@@ -637,7 +637,10 @@ if __name__ == '__main__':
condarc_options = yaml.load(f)
# dump packages at conda_root
- condarc_options['croot'] = os.path.join(args.conda_root, 'conda-bld')
+ prefix = get_env_directory(os.environ['CONDA_EXE'], 'base')
+ if condarc_options.get('conda-build', {}).get('root-dir') is None:
+ condarc_options['croot'] = os.path.join(prefix, 'conda-bld')
+
# builds all dependencies in the 'deps' subdirectory - or at least checks
# these dependencies are already available; these dependencies go directly to
--
GitLab