Skip to content
Snippets Groups Projects

Do not overwrite conda-build root dir if already configured

Merged Samuel GAIST requested to merge improve_croot_handling into master
2 unresolved threads

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.

Merge request reports

Pipeline #27535 passed

Pipeline passed for f64a36c4 on improve_croot_handling

Merged by André AnjosAndré Anjos 6 years ago (Feb 27, 2019 8:18am UTC)

Loading

Pipeline #27590 passed

Pipeline passed for a75dbbcf on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
637 637 condarc_options = yaml.load(f)
638 638
639 639 # dump packages at conda_root
640 condarc_options['croot'] = os.path.join(args.conda_root, 'conda-bld')
640 prefix = get_env_directory(os.environ['CONDA_EXE'], 'base')
641 if 'conda-build' in condarc_options \
642 and not 'root-dir' in condarc_options['conda-build']:
643 condarc_options['croot'] = os.path.join(prefix, 'conda-bld')
  • Samuel GAIST added 1 commit

    added 1 commit

    • 530ba0df - [build] Do not overwrite conda-build root dir if already configured

    Compare with previous version

  • Samuel GAIST added 6 commits

    added 6 commits

    Compare with previous version

  • 637 637 condarc_options = yaml.load(f)
    638 638
    639 639 # dump packages at conda_root
    640 condarc_options['croot'] = os.path.join(args.conda_root, 'conda-bld')
    640 prefix = get_env_directory(os.environ['CONDA_EXE'], 'base')
    641 if not 'conda-build' in condarc_options \
    642 or ('conda-build' in condarc_options \
  • Author Maintainer

    Will do.

  • Samuel GAIST added 1 commit

    added 1 commit

    • f64a36c4 - [build] Do not overwrite conda-build root dir if already configured

    Compare with previous version

  • LGTM now. Thx.

  • merged

  • André Anjos mentioned in commit a75dbbcf

    mentioned in commit a75dbbcf

  • Please register or sign in to reply
    Loading