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

Add support for .tbz file extensions (#24479)

Browse Source
This commit is contained in:
Adam J. Stewart 2021-06-25 10:37:23 -05:00 committed by GitHub
parent 3087d74ca7
commit 2bc0c0ea59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/spack/spack/test/url_parse.py
View File

@ -429,6 +429,8 @@ def test_url_parse_offset(name, noffset, ver, voffset, path):
# .tgz # .tgz
('ADOL-C', '2.6.1', ('ADOL-C', '2.6.1',
'http://www.coin-or.org/download/source/ADOL-C/ADOL-C-2.6.1.tgz'), 'http://www.coin-or.org/download/source/ADOL-C/ADOL-C-2.6.1.tgz'),
# .tbz
('mpfr', '4.0.1', 'https://ftpmirror.gnu.org/mpfr/mpfr-4.0.1.tbz'),
# .tbz2 # .tbz2
('mpfr', '4.0.1', 'https://ftpmirror.gnu.org/mpfr/mpfr-4.0.1.tbz2'), ('mpfr', '4.0.1', 'https://ftpmirror.gnu.org/mpfr/mpfr-4.0.1.tbz2'),
# .txz # .txz

2
lib/spack/spack/util/compression.py
View File

@ -11,7 +11,7 @@
# Supported archive extensions. # Supported archive extensions.
PRE_EXTS = ["tar", "TAR"] PRE_EXTS = ["tar", "TAR"]
EXTS = ["gz", "bz2", "xz", "Z"] EXTS = ["gz", "bz2", "xz", "Z"]
NOTAR_EXTS = ["zip", "tgz", "tbz2", "txz"] NOTAR_EXTS = ["zip", "tgz", "tbz", "tbz2", "txz"]
# Add PRE_EXTS and EXTS last so that .tar.gz is matched *before* .tar or .gz # Add PRE_EXTS and EXTS last so that .tar.gz is matched *before* .tar or .gz
ALLOWED_ARCHIVE_TYPES = [".".join(ext) for ext in product( ALLOWED_ARCHIVE_TYPES = [".".join(ext) for ext in product(