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

directory_layout: fix error path when specs conflict

Browse Source
This commit is contained in:
Ben Boeckel 2016-03-10 09:44:58 -05:00
parent e275b567eb
commit b4682c8ca3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/spack/spack/directory_layout.py
View File

@ -285,7 +285,7 @@ def check_installed(self, spec):
return path return path
if spec.dag_hash() == installed_spec.dag_hash(): if spec.dag_hash() == installed_spec.dag_hash():
raise SpecHashCollisionError(installed_hash, spec_hash) raise SpecHashCollisionError(spec, installed_spec)
else: else:
raise InconsistentInstallDirectoryError( raise InconsistentInstallDirectoryError(
'Spec file in %s does not match hash!' % spec_file_path) 'Spec file in %s does not match hash!' % spec_file_path)
@ -431,7 +431,7 @@ class SpecHashCollisionError(DirectoryLayoutError):
def __init__(self, installed_spec, new_spec): def __init__(self, installed_spec, new_spec):
super(SpecHashCollisionError, self).__init__( super(SpecHashCollisionError, self).__init__(
'Specs %s and %s have the same SHA-1 prefix!' 'Specs %s and %s have the same SHA-1 prefix!'
% installed_spec, new_spec) % (installed_spec, new_spec))
class RemoveFailedError(DirectoryLayoutError): class RemoveFailedError(DirectoryLayoutError):