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

directory_layout now raises an error when an install fails.

Browse Source
This commit is contained in:
Todd Gamblin 2015-02-08 19:36:30 -08:00
parent 5cc369c2b8
commit befe72b9b9
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,12 +109,17 @@ def path_for_spec(self, spec):
def remove_path_for_spec(self, spec): def remove_path_for_spec(self, spec):
"""Removes a prefix and any empty parent directories from the root.""" """Removes a prefix and any empty parent directories from the root.
Raised RemoveFailedError if something goes wrong.
"""
path = self.path_for_spec(spec) path = self.path_for_spec(spec)
assert(path.startswith(self.root)) assert(path.startswith(self.root))
if os.path.exists(path): if os.path.exists(path):
shutil.rmtree(path, True) try:
shutil.rmtree(path)
except exceptions.OSError, e:
raise RemoveFailedError(spec, path, e)
path = os.path.dirname(path) path = os.path.dirname(path)
while path != self.root: while path != self.root:
@ -330,6 +335,15 @@ def __init__(self, installed_spec, new_spec):
% installed_spec, new_spec) % installed_spec, new_spec)
class RemoveFailedError(DirectoryLayoutError):
"""Raised when a DirectoryLayout cannot remove an install prefix."""
def __init__(self, installed_spec, prefix, error):
super(RemoveFailedError, self).__init__(
'Could not remove prefix %s for %s : %s'
% prefix, installed_spec.short_spec, error)
self.cause = error
class InconsistentInstallDirectoryError(DirectoryLayoutError): class InconsistentInstallDirectoryError(DirectoryLayoutError):
"""Raised when a package seems to be installed to the wrong place.""" """Raised when a package seems to be installed to the wrong place."""
def __init__(self, message): def __init__(self, message):
@ -370,3 +384,5 @@ def __init__(self, spec, extension_spec):
super(NoSuchExtensionError, self).__init__( super(NoSuchExtensionError, self).__init__(
"%s cannot be removed from %s because it's not installed."% ( "%s cannot be removed from %s because it's not installed."% (
extension_spec.short_spec, spec.short_spec)) extension_spec.short_spec, spec.short_spec))