diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2016-02-12 09:59:07 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2016-02-12 09:59:07 -0800 |
| commit | f0db7190ff14a634dd3eb2ba3f10b1cbfd19e1f3 (patch) | |
| tree | 9a6ee80c8ffa940e37465819579112c2913ecf5b | |
| parent | d541a4bd296aa7089f64f2071aebaf7112587bce (diff) | |
| parent | 90e1b1f0ea4320a5bdc0f54ec14a12fdda6584ff (diff) | |
| download | spack-f0db7190ff14a634dd3eb2ba3f10b1cbfd19e1f3.tar.gz spack-f0db7190ff14a634dd3eb2ba3f10b1cbfd19e1f3.tar.bz2 spack-f0db7190ff14a634dd3eb2ba3f10b1cbfd19e1f3.tar.xz spack-f0db7190ff14a634dd3eb2ba3f10b1cbfd19e1f3.zip | |
Merge pull request #437 from davidbeckingsale/features/dk-short-names
Use hash to make shorter module and dotkit names, fixes #433
| -rw-r--r-- | lib/spack/spack/modules.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/spack/spack/modules.py b/lib/spack/spack/modules.py index 7036626e29..c834763564 100644 --- a/lib/spack/spack/modules.py +++ b/lib/spack/spack/modules.py @@ -194,12 +194,14 @@ class Dotkit(EnvModule): @property def file_name(self): return join_path(Dotkit.path, self.spec.architecture, - self.spec.format('$_$@$%@$+$#.dk')) + '%s.dk' % self.use_name) @property def use_name(self): - return self.spec.format('$_$@$%@$+$#') - + return "%s-%s-%s-%s-%s" % (self.spec.name, self.spec.version, + self.spec.compiler.name, + self.spec.compiler.version, + self.spec.dag_hash()) def _write(self, dk_file): # Category @@ -235,7 +237,10 @@ class TclModule(EnvModule): @property def use_name(self): - return self.spec.format('$_$@$%@$+$#') + return "%s-%s-%s-%s-%s" % (self.spec.name, self.spec.version, + self.spec.compiler.name, + self.spec.compiler.version, + self.spec.dag_hash()) def _write(self, m_file): |