diff --git a/lib/spack/spack/main.py b/lib/spack/spack/main.py index 08c293b6c024f3e07d5ef3a11d8c95fa86d21493..324012d4944016e29b86114ed63ed583cc079b9c 100644 --- a/lib/spack/spack/main.py +++ b/lib/spack/spack/main.py @@ -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): diff --git a/lib/spack/spack/test/cmd/print_shell_vars.py b/lib/spack/spack/test/cmd/print_shell_vars.py index 45019d9178589cc991c6c3aed7431fe35050f9c9..cc025437918fe4b62fb5936947f298191f5a8e1b 100644 --- a/lib/spack/spack/test/cmd/print_shell_vars.py +++ b/lib/spack/spack/test/cmd/print_shell_vars.py @@ -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