hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Windows decompression: fix removal of intermediate file (#38958)

Browse source 
Extensionless archives requiring two-stage decompression and extraction
require intermediate archives to be renamed after decompression/extraction
to prevent collision. Prior behavior attempted to cleanup the intermediate
archive with the original name, this PR ensures the renamed folder is
cleaned instead.

Co-authored-by: Dan Lipsa <dan.lipsa@khq.kitware.com>
Co-authored-by: John Parent <john.parent@kitware.com>
This commit is contained in:
Dan Lipsa 2023-09-08 13:27:43 -04:00 committed by GitHub
parent 45d149c7d3
commit 9e7fe04a77
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/spack/spack/util/compression.py
View file

@ -70,7 +70,7 @@ def allowed_archive(path):
return False if not path else any(path.endswith(t) for t in ALLOWED_ARCHIVE_TYPES) return False if not path else any(path.endswith(t) for t in ALLOWED_ARCHIVE_TYPES)
def _system_untar(archive_file): def _system_untar(archive_file, remove_archive_file=False):
"""Returns path to unarchived tar file. """Returns path to unarchived tar file.
Untars archive via system tar. Untars archive via system tar.
@ -89,6 +89,11 @@ def _system_untar(archive_file):
tar = which("tar", required=True) tar = which("tar", required=True)
tar.add_default_arg("-oxf") tar.add_default_arg("-oxf")
tar(archive_file) tar(archive_file)
if remove_archive_file:
# remove input file to prevent two stage
# extractions from being treated as exploding
# archives by the fetcher
os.remove(archive_file)
return outfile return outfile
@ -243,13 +248,9 @@ def _win_compressed_tarball_handler(decompressor):
def unarchive(archive_file): def unarchive(archive_file):
# perform intermediate extraction step # perform intermediate extraction step
# record name of new archive so we can extract # record name of new archive so we can extract
# and later clean up
decomped_tarball = decompressor(archive_file) decomped_tarball = decompressor(archive_file)
# run tar on newly decomped archive # run tar on newly decomped archive
outfile = _system_untar(decomped_tarball) outfile = _system_untar(decomped_tarball, remove_archive_file=True)
# clean intermediate archive to mimic end result
# produced by one shot decomp/extraction
os.remove(decomped_tarball)
return outfile return outfile
return unarchive return unarchive