Skip to content
Snippets Groups Projects
Commit a75dbbcf authored by André Anjos's avatar André Anjos :speech_balloon:
Browse files

Merge branch 'improve_croot_handling' into 'master'

Do not overwrite conda-build root dir if already configured

See merge request !25
parents a59f4a2c f64a36c4
Branches
Tags
1 merge request!25Do not overwrite conda-build root dir if already configured
Pipeline #27590 passed
...@@ -599,7 +599,10 @@ if __name__ == '__main__': ...@@ -599,7 +599,10 @@ if __name__ == '__main__':
condarc_options = yaml.load(f) condarc_options = yaml.load(f)
# dump packages at conda_root # 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 # builds all dependencies in the 'deps' subdirectory - or at least checks
# these dependencies are already available; these dependencies go directly to # these dependencies are already available; these dependencies go directly to
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment