diff options
author | Todd Gamblin <tgamblin@llnl.gov> | 2018-04-14 19:51:29 -0700 |
---|---|---|
committer | scheibelp <scheibel1@llnl.gov> | 2018-05-17 14:10:30 -0700 |
commit | 863ccd5e94803eed96123d7bfc0add29bf9fb99b (patch) | |
tree | d47c87539c6174bd761972466fe69587bfbb3c3b /share | |
parent | c9ea9575637ed71ba5dc055609544afcb7429852 (diff) | |
download | spack-863ccd5e94803eed96123d7bfc0add29bf9fb99b.tar.gz spack-863ccd5e94803eed96123d7bfc0add29bf9fb99b.tar.bz2 spack-863ccd5e94803eed96123d7bfc0add29bf9fb99b.tar.xz spack-863ccd5e94803eed96123d7bfc0add29bf9fb99b.zip |
config: simplify configuration API to just get and set
- replace `spack.config.get_configuration()` with `spack.config.config()`
- replace `get_config`/`update_config` with `get`, `set`
- add a path syntax that can be used to refer to specific config options
without firt getting the entire configuration dict
- update usages of `get_config` and `update_config` to use `get` and `set`
Diffstat (limited to 'share')
-rwxr-xr-x | share/spack/setup-env.csh | 4 | ||||
-rwxr-xr-x | share/spack/setup-env.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/share/spack/setup-env.csh b/share/spack/setup-env.csh index b17b753bbe..0f67ef7906 100755 --- a/share/spack/setup-env.csh +++ b/share/spack/setup-env.csh @@ -41,8 +41,8 @@ if ($?SPACK_ROOT) then # Shamelessly stolen from setup-env.sh set _sp_sys_type = `$SPACK_ROOT/bin/spack python -c 'print(spack.architecture.sys_type())'` - set _sp_dotkit_root = `$SPACK_ROOT/bin/spack python -c "print(spack.util.path.canonicalize_path(spack.config.get_config('config').get('module_roots').get('dotkit')))"` - set _sp_tcl_root = `$SPACK_ROOT/bin/spack python -c "print(spack.util.path.canonicalize_path(spack.config.get_config('config').get('module_roots').get('tcl')))"` + set _sp_dotkit_root = `$SPACK_ROOT/bin/spack python -c "print(spack.util.path.canonicalize_path(spack.config.get('config:module_roots', {}).get('dotkit')))"` + set _sp_tcl_root = `$SPACK_ROOT/bin/spack python -c "print(spack.util.path.canonicalize_path(spack.config.get('config:module_roots', {}).get('tcl')))"` # Set up modules and dotkit search paths in the user environment _spack_pathadd DK_NODE "$_sp_dotkit_root/$_sp_sys_type" diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh index 1dbc49c8a7..b983299975 100755 --- a/share/spack/setup-env.sh +++ b/share/spack/setup-env.sh @@ -239,8 +239,8 @@ fi; _python_command=$(printf "%s\\\n%s\\\n%s" \ "print(\'_sp_sys_type={0}\'.format(spack.architecture.sys_type()))" \ -"print(\'_sp_dotkit_root={0}\'.format(spack.util.path.canonicalize_path(spack.config.get_config(\'config\').get(\'module_roots\', {}).get(\'dotkit\'))))" \ -"print(\'_sp_tcl_root={0}\'.format(spack.util.path.canonicalize_path(spack.config.get_config(\'config\').get(\'module_roots\', {}).get(\'tcl\'))))" +"print(\'_sp_dotkit_root={0}\'.format(spack.util.path.canonicalize_path(spack.config.get(\'config:module_roots\', {}).get(\'dotkit\'))))" \ +"print(\'_sp_tcl_root={0}\'.format(spack.util.path.canonicalize_path(spack.config.get(\'config:module_roots\', {}).get(\'tcl\'))))" ) _assignment_command=$(spack-python -c "exec('${_python_command}')") |