diff options
| -rw-r--r-- | lib/spack/spack/test/modules/tcl.py | 2 | ||||
| -rw-r--r-- | share/spack/templates/modules/modulefile.tcl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/spack/spack/test/modules/tcl.py b/lib/spack/spack/test/modules/tcl.py index 769bcf50a7..0d30e19958 100644 --- a/lib/spack/spack/test/modules/tcl.py +++ b/lib/spack/spack/test/modules/tcl.py @@ -113,7 +113,7 @@ class TestTcl(object): assert len([x for x in content if x.startswith("prepend-path CMAKE_PREFIX_PATH")]) == 0 assert len([x for x in content if 'setenv FOO "foo"' in x]) == 0 assert len([x for x in content if "unsetenv BAR" in x]) == 0 - assert len([x for x in content if "is-loaded foo/bar" in x]) == 1 + assert len([x for x in content if "is-loaded 'foo/bar'" in x]) == 1 assert len([x for x in content if "module load foo/bar" in x]) == 1 assert len([x for x in content if "setenv LIBDWARF_ROOT" in x]) == 1 diff --git a/share/spack/templates/modules/modulefile.tcl b/share/spack/templates/modules/modulefile.tcl index 21dacfedc0..0c11f7c106 100644 --- a/share/spack/templates/modules/modulefile.tcl +++ b/share/spack/templates/modules/modulefile.tcl @@ -23,7 +23,7 @@ proc ModulesHelp { } { {% block autoloads %} {% for module in autoload %} -if {{ '{' }} [ module-info mode load ] && ![ is-loaded {{ module }} ] {{ '}' }} {{ '{' }} +if {{ '{' }} ![ is-loaded '{{ module }}' ] {{ '}' }} {{ '{' }} {% if verbose %} puts stderr "Autoloading {{ module }}" {% endif %} |