diff options
| author | Massimiliano Culpo <massimiliano.culpo@gmail.com> | 2018-07-10 09:08:01 +0200 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2018-07-24 11:27:17 -0700 |
| commit | c0d9de240ae49c3e5dccfdefbfcecfc4574cd539 (patch) | |
| tree | 67ccbd682b5f6bec73124d57128b51d663e70e29 /share/spack/setup-env.sh | |
| parent | 7a49ba56b65174488e7b1f16018c1bb1874bce20 (diff) | |
| download | spack-c0d9de240ae49c3e5dccfdefbfcecfc4574cd539.tar.gz spack-c0d9de240ae49c3e5dccfdefbfcecfc4574cd539.tar.bz2 spack-c0d9de240ae49c3e5dccfdefbfcecfc4574cd539.tar.xz spack-c0d9de240ae49c3e5dccfdefbfcecfc4574cd539.zip | |
Revert "Fix recursive module loading."
This reverts commit 732c24f603864ec7dbec425ac4507b47fdb7a641.
Diffstat (limited to 'share/spack/setup-env.sh')
| -rwxr-xr-x | share/spack/setup-env.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh index 023056d103..5774e8f762 100755 --- a/share/spack/setup-env.sh +++ b/share/spack/setup-env.sh @@ -121,19 +121,19 @@ function spack { # If spack module command comes back with an error, do nothing. case $_sp_subcommand in "use") - if _sp_full_spec=$(command spack $_sp_flags module loads --input-only $_sp_subcommand_args --module-type dotkit "${_sp_spec[@]}"); then + if _sp_full_spec=$(command spack $_sp_flags dotkit find $_sp_subcommand_args "${_sp_spec[@]}"); then use $_sp_module_args $_sp_full_spec fi ;; "unuse") - if _sp_full_spec=$(command spack $_sp_flags module loads --input-only $_sp_subcommand_args --module-type dotkit "${_sp_spec[@]}"); then + if _sp_full_spec=$(command spack $_sp_flags dotkit find $_sp_subcommand_args "${_sp_spec[@]}"); then unuse $_sp_module_args $_sp_full_spec fi ;; "load") - if _sp_full_spec=$(command spack $_sp_flags module loads --input-only $_sp_subcommand_args --module-type tcl "${_sp_spec[@]}"); then + if _sp_full_spec=$(command spack $_sp_flags tcl find $_sp_subcommand_args "${_sp_spec[@]}"); then module load $_sp_module_args $_sp_full_spec fi ;; "unload") - if _sp_full_spec=$(command spack $_sp_flags module loads --input-only $_sp_subcommand_args --module-type tcl "${_sp_spec[@]}"); then + if _sp_full_spec=$(command spack $_sp_flags tcl find $_sp_subcommand_args "${_sp_spec[@]}"); then module unload $_sp_module_args $_sp_full_spec fi ;; esac |