diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/fetch_strategy.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/util/compression.py | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/lib/spack/spack/fetch_strategy.py b/lib/spack/spack/fetch_strategy.py index aaec9a40cd..bd7331e1a1 100644 --- a/lib/spack/spack/fetch_strategy.py +++ b/lib/spack/spack/fetch_strategy.py @@ -521,7 +521,7 @@ class URLFetchStrategy(FetchStrategy): "Failed on expand() for URL %s" % self.url) if not self.extension: - self.extension = extension(self.archive_file) + self.extension = extension(self.url) if self.stage.expanded: tty.debug('Source already staged to %s' % self.stage.source_path) diff --git a/lib/spack/spack/util/compression.py b/lib/spack/spack/util/compression.py index 9a8eda0c91..18c0a9ea5e 100644 --- a/lib/spack/spack/util/compression.py +++ b/lib/spack/spack/util/compression.py @@ -246,7 +246,7 @@ unable to extract %s files. 7z can be installed via Spack" % ext) return outfile -def decompressor_for(path, ext=None): +def decompressor_for(path, ext): """Returns a function pointer to appropriate decompression algorithm based on extension type. @@ -254,9 +254,6 @@ def decompressor_for(path, ext=None): path (str): path of the archive file requiring decompression ext (str): Extension of archive file """ - if not ext: - ext = extension(path) - if not allowed_archive(ext): raise CommandNotFoundError("Cannot extract archive, \ unrecognized file extension: '%s'" % ext) |