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

Merge pull request #437 from davidbeckingsale/features/dk-short-names

Browse Source 
Use hash to make shorter module and dotkit names, fixes #433
This commit is contained in:
Todd Gamblin 2016-02-12 09:59:07 -08:00
commit f0db7190ff
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/spack/spack/modules.py
View File

@ -194,12 +194,14 @@ class Dotkit(EnvModule):
@property @property
def file_name(self): def file_name(self):
return join_path(Dotkit.path, self.spec.architecture, return join_path(Dotkit.path, self.spec.architecture,
self.spec.format('$_$@$%@$+$#.dk')) '%s.dk' % self.use_name)
@property @property
def use_name(self): 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): def _write(self, dk_file):
# Category # Category
@ -235,7 +237,10 @@ def file_name(self):
@property @property
def use_name(self): 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): def _write(self, m_file):