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

shell: fixed a typo in spack --print-shell-vars (#8732)

Browse Source
This commit is contained in:
Massimiliano Culpo 2018-07-18 02:03:45 +02:00 committed by Todd Gamblin
parent 111512ce7b
commit 33aa06e1cf
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -589,9 +589,9 @@ def shell_set(var, value):
if 'modules' in info:
specs = spack.store.db.query('environment-modules')
if specs:
shell_set('module_prefix', specs[-1].prefix)
shell_set('_sp_module_prefix', specs[-1].prefix)
else:
shell_set('module_prefix', 'not_installed')
shell_set('_sp_module_prefix', 'not_installed')
def main(argv=None):

8
lib/spack/spack/test/cmd/print_shell_vars.py
View File

@ -32,7 +32,7 @@ def test_print_shell_vars_sh(capsys):
assert "_sp_sys_type=" in out
assert "_sp_tcl_root=" in out
assert "_sp_lmod_root=" in out
assert "module_prefix" not in out
assert "_sp_module_prefix" not in out
def test_print_shell_vars_csh(capsys):
@ -42,7 +42,7 @@ def test_print_shell_vars_csh(capsys):
assert "set _sp_sys_type = " in out
assert "set _sp_tcl_root = " in out
assert "set _sp_lmod_root = " in out
assert "set module_prefix = " not in out
assert "set _sp_module_prefix = " not in out
def test_print_shell_vars_sh_modules(capsys):
@ -52,7 +52,7 @@ def test_print_shell_vars_sh_modules(capsys):
assert "_sp_sys_type=" in out
assert "_sp_tcl_root=" in out
assert "_sp_lmod_root=" in out
assert "module_prefix=" in out
assert "_sp_module_prefix=" in out
def test_print_shell_vars_csh_modules(capsys):
@ -62,4 +62,4 @@ def test_print_shell_vars_csh_modules(capsys):
assert "set _sp_sys_type = " in out
assert "set _sp_tcl_root = " in out
assert "set _sp_lmod_root = " in out
assert "set module_prefix = " in out
assert "set _sp_module_prefix = " in out