Merge pull request #681 from LLNL/bugfix/complete-restage
Fix bug in restage
This commit is contained in:
commit
a05bea7de5
@ -289,8 +289,14 @@ def reset(self):
|
|||||||
if not self.archive_file:
|
if not self.archive_file:
|
||||||
raise NoArchiveFileError("Tried to reset URLFetchStrategy before fetching",
|
raise NoArchiveFileError("Tried to reset URLFetchStrategy before fetching",
|
||||||
"Failed on reset() for URL %s" % self.url)
|
"Failed on reset() for URL %s" % self.url)
|
||||||
if self.stage.source_path:
|
|
||||||
shutil.rmtree(self.stage.source_path, ignore_errors=True)
|
# Remove everythigng but the archive from the stage
|
||||||
|
for filename in os.listdir(self.stage.path):
|
||||||
|
abspath = os.path.join(self.stage.path, filename)
|
||||||
|
if abspath != self.archive_file:
|
||||||
|
shutil.rmtree(abspath, ignore_errors=True)
|
||||||
|
|
||||||
|
# Expand the archive again
|
||||||
self.expand()
|
self.expand()
|
||||||
|
|
||||||
def __repr__(self):
|
def __repr__(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user