diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2016-03-10 09:44:58 -0500 |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2016-07-14 16:21:45 -0400 |
| commit | b4682c8ca3a1a7b5898c0298cdc3bf2089652779 (patch) | |
| tree | 967f39227a0cb6c877712bdc7b134907d5b75f1a /lib | |
| parent | e275b567eb5b830897e726d90a0d0d56b080b705 (diff) | |
| download | spack-b4682c8ca3a1a7b5898c0298cdc3bf2089652779.tar.gz spack-b4682c8ca3a1a7b5898c0298cdc3bf2089652779.tar.bz2 spack-b4682c8ca3a1a7b5898c0298cdc3bf2089652779.tar.xz spack-b4682c8ca3a1a7b5898c0298cdc3bf2089652779.zip | |
directory_layout: fix error path when specs conflict
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/directory_layout.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/spack/spack/directory_layout.py b/lib/spack/spack/directory_layout.py index ee13e2dcbc..a5e76043ad 100644 --- a/lib/spack/spack/directory_layout.py +++ b/lib/spack/spack/directory_layout.py @@ -285,7 +285,7 @@ class YamlDirectoryLayout(DirectoryLayout): return path if spec.dag_hash() == installed_spec.dag_hash(): - raise SpecHashCollisionError(installed_hash, spec_hash) + raise SpecHashCollisionError(spec, installed_spec) else: raise InconsistentInstallDirectoryError( '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): super(SpecHashCollisionError, self).__init__( 'Specs %s and %s have the same SHA-1 prefix!' - % installed_spec, new_spec) + % (installed_spec, new_spec)) class RemoveFailedError(DirectoryLayoutError): |