From bd236918dd598e217ca553f1c24780a1411d1c98 Mon Sep 17 00:00:00 2001 From: "Dr. Christian Tacke" <58549698+ChristianTackeGSI@users.noreply.github.com> Date: Mon, 20 Jul 2020 22:58:06 +0200 Subject: Configuration: allow usage of command-line scopes with environments (#14608) Spack did not support usage of the `--config-scope` option in combination with an environment: In `lib/spack/spack/main.py`, `spack.config.command_line_scopes` is set equal to any config scopes passed by the `--config-scope` option. However, this is done after activating an environment. In the process of activating an environment, the `spack.config.config` singleton is instantiated, so later setting of `spack.config.command_line_scopes` is ignored. This commit sets command line scopes before activating an environment to ensure that they are included in the configuration. Co-authored-by: Tim Fuller --- lib/spack/spack/main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/spack/spack/main.py b/lib/spack/spack/main.py index bdeef049ff..2421ece4be 100644 --- a/lib/spack/spack/main.py +++ b/lib/spack/spack/main.py @@ -701,16 +701,16 @@ def main(argv=None): if stored_var_name in os.environ: os.environ[var] = os.environ[stored_var_name] + # make spack.config aware of any command line configuration scopes + if args.config_scopes: + spack.config.command_line_scopes = args.config_scopes + # activate an environment if one was specified on the command line if not args.no_env: env = ev.find_environment(args) if env: ev.activate(env, args.use_env_repo) - # make spack.config aware of any command line configuration scopes - if args.config_scopes: - spack.config.command_line_scopes = args.config_scopes - if args.print_shell_vars: print_setup_info(*args.print_shell_vars.split(',')) return 0 -- cgit v1.2.3-60-g2f50