Accepting request 880147 from network:cluster

OBS-URL: https://build.opensuse.org/request/show/880147
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/spack?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2021-03-20 20:26:02 +00:00 committed by Git OBS Bridge
commit c09ee693c2
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Mar 19 15:04:20 UTC 2021 - Christian Goll <cgoll@suse.com>
- set the right MODULEPATH in /etc/profile.d/spack.[cs]h
-------------------------------------------------------------------
Fri Feb 26 22:06:36 UTC 2021 - Egbert Eich <eich@suse.com>

View File

@ -289,7 +289,7 @@ else
SPACK_NAME="\${ID/-/_}\${VERSION_ID/.*/}"
fi
export SPACK_ROOT=%{spack_dir}
export MODULEPATH=~/spack/lmod/linux-\${SPACK_NAME}-\${CPU}:%{_prefix}/share/spack/lmod/linux-\${SPACK_NAME}-\${CPU}:\${MODULEPATH}
export MODULEPATH=~/spack/modules/linux-\${SPACK_NAME}-\${CPU}:%{_prefix}/share/spack/modules/linux-\${SPACK_NAME}-\${CPU}:\${MODULEPATH}
# copy local configuration, if its not there
if [ ! -e ~/.spack/config.yaml ] ; then
# test if user is in spack group by touching database
@ -313,7 +313,7 @@ else
set SPACK_NAME="\${ID}\${VERSION_ID}"
endif
set SPACK_ROOT="%{spack_dir}"
set MODULEPATH="~/spack/lmod/linux-\${SPACK_NAME}-\${CPU}:%{_prefix}/share/spack/lmod/linux-\${SPACK_NAME}-\${CPU}:\${MODULEPATH}"
set MODULEPATH="~/spack/modules/linux-\${SPACK_NAME}-\${CPU}:%{_prefix}/share/spack/modules/linux-\${SPACK_NAME}-\${CPU}:\${MODULEPATH}"
if ( ! -e ~/.spack/config.yaml ) then
# test if user is in spack group by touching database
touch %{spack_dir}/.spack-db >& /dev/null