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

Fix #217: Make package cache use DAG hash instead of sorted deps.

Browse Source 
- Gets rid of last vestige of old-style specs.
- Uses new hashing for lookup
This commit is contained in:
Todd Gamblin 2015-12-11 02:16:24 -08:00
parent 3163d016db
commit 7526a89463
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/spack/spack/packages.py
View File

@ -67,27 +67,28 @@ def get(self, spec, **kwargs):
if spec.virtual: if spec.virtual:
raise UnknownPackageError(spec.name) raise UnknownPackageError(spec.name)
dhash = spec.dag_hash()
if kwargs.get('new', False): if kwargs.get('new', False):
if spec in self.instances: if dhash in self.instances:
del self.instances[spec] del self.instances[dhash]
if not spec in self.instances: if not dhash in self.instances:
package_class = self.get_class_for_package_name(spec.name) package_class = self.get_class_for_package_name(spec.name)
try: try:
copy = spec.copy() copy = spec.copy() # defensive copy. Package owns its spec.
self.instances[copy] = package_class(copy) self.instances[dhash] = package_class(copy)
except Exception, e: except Exception, e:
if spack.debug: if spack.debug:
sys.excepthook(*sys.exc_info()) sys.excepthook(*sys.exc_info())
raise FailedConstructorError(spec.name, e) raise FailedConstructorError(spec.name, e)
return self.instances[spec] return self.instances[dhash]
@_autospec @_autospec
def delete(self, spec): def delete(self, spec):
"""Force a package to be recreated.""" """Force a package to be recreated."""
del self.instances[spec] del self.instances[spec.dag_hash()]
def purge(self): def purge(self):