diff options
| author | Todd Gamblin <gamblin2@llnl.gov> | 2021-10-28 14:33:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-28 21:33:44 +0000 |
| commit | a1216138f6af6985e231fc8d7b2cf6011bb11a00 (patch) | |
| tree | b4b5939fbf19cc3933744d223e72a6d5f8541d44 /etc | |
| parent | d0e177e7118ebf1b55004e9ae34516af1266ad9a (diff) | |
| download | spack-a1216138f6af6985e231fc8d7b2cf6011bb11a00.tar.gz spack-a1216138f6af6985e231fc8d7b2cf6011bb11a00.tar.bz2 spack-a1216138f6af6985e231fc8d7b2cf6011bb11a00.tar.xz spack-a1216138f6af6985e231fc8d7b2cf6011bb11a00.zip | |
config: fix `SPACK_DISABLE_LOCAL_CONFIG`, remove `$user_config_path` (#27022)
There were some loose ends left in ##26735 that cause errors when
using `SPACK_DISABLE_LOCAL_CONFIG`.
- [x] Fix hard-coded `~/.spack` references in `install_test.py` and `monitor.py`
Also, if `SPACK_DISABLE_LOCAL_CONFIG` is used, there is the issue that
`$user_config_path`, when used in configuration files, makes no sense,
because there is no user config scope.
Since we already have `$user_cache_path` in configuration files, and since there
really shouldn't be *any* data stored in a configuration scope (which is what
you'd configure in `config.yaml`/`bootstrap.yaml`/etc., this just removes
`$user_config_path`.
There will *always* be a `$user_cache_path`, as Spack needs to write files, but
we shouldn't rely on the existence of a particular configuration scope in the
Spack code, as scopes are configurable, both in number and location.
- [x] Remove `$user_config_path` substitution.
- [x] Fix reference to `$user_config_path` in `etc/spack/deaults/bootstrap.yaml`
to refer to `$user_cache_path`, which is where it was intended to be.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/spack/defaults/bootstrap.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/spack/defaults/bootstrap.yaml b/etc/spack/defaults/bootstrap.yaml index 7a72bdfe6a..e51e406dff 100644 --- a/etc/spack/defaults/bootstrap.yaml +++ b/etc/spack/defaults/bootstrap.yaml @@ -4,7 +4,7 @@ bootstrap: enable: true # Root directory for bootstrapping work. The software bootstrapped # by Spack is installed in a "store" subfolder of this root directory - root: $user_config_path/bootstrap + root: $user_cache_path/bootstrap # Methods that can be used to bootstrap software. Each method may or # may not be able to bootstrap all of the software that Spack needs, # depending on its type. @@ -29,4 +29,4 @@ bootstrap: # By default we trust bootstrapping from sources and from binaries # produced on Github via the workflow github-actions: true - spack-install: true
\ No newline at end of file + spack-install: true |