zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Configuration: allow usage of command-line scopes with environments (#14608)

Browse Source 
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 <tjfulle@sandia.gov>
This commit is contained in:
Dr. Christian Tacke 2020-07-20 22:58:06 +02:00 committed by GitHub
parent 3949a85f9a
commit bd236918dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/spack/spack/main.py
View File

@ -701,16 +701,16 @@ def main(argv=None):
if stored_var_name in os.environ: if stored_var_name in os.environ:
os.environ[var] = os.environ[stored_var_name] 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 # activate an environment if one was specified on the command line
if not args.no_env: if not args.no_env:
env = ev.find_environment(args) env = ev.find_environment(args)
if env: if env:
ev.activate(env, args.use_env_repo) 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: if args.print_shell_vars:
print_setup_info(*args.print_shell_vars.split(',')) print_setup_info(*args.print_shell_vars.split(','))
return 0 return 0