summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGreg Becker <becker33@llnl.gov>2019-04-19 13:20:41 -0700
committerPeter Scheibel <scheibel1@llnl.gov>2019-04-19 13:20:41 -0700
commit141e8b8de39217be5600cfcb5d5848effdeef3fe (patch)
tree6c8a09873dc51fea0fb7c8ef2a49b0bf2e85713c /lib
parent7ee9953deceef3789c5fd144f80ef235329238ac (diff)
downloadspack-141e8b8de39217be5600cfcb5d5848effdeef3fe.tar.gz
spack-141e8b8de39217be5600cfcb5d5848effdeef3fe.tar.bz2
spack-141e8b8de39217be5600cfcb5d5848effdeef3fe.tar.xz
spack-141e8b8de39217be5600cfcb5d5848effdeef3fe.zip
Fix backwards compatibility for module naming (#11236)
f242f5f8 changed the format strings but maintained backwards compatibility in all cases except one: The list of valid tokens for the module naming schemes was not updated properly to contain both the new and old styles for compilers and package names. This PR re-adds the old tokens into the list of valid tokens.
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/modules/common.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/spack/spack/modules/common.py b/lib/spack/spack/modules/common.py
index a372f3dd01..e16e366cb0 100644
--- a/lib/spack/spack/modules/common.py
+++ b/lib/spack/spack/modules/common.py
@@ -65,6 +65,10 @@ _valid_tokens = (
'compiler.name',
'compiler.version',
'architecture'
+ # tokens from old-style format strings
+ 'package',
+ 'compilername',
+ 'compilerver',
)