summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Todd Gamblin <gamblin2@llnl.gov>2014-03-13 15:24:00 -0700
committerGeorge Todd Gamblin <gamblin2@llnl.gov>2014-03-13 15:24:00 -0700
commitd905a1350ac939c70eb5f3742956d0dd0a219518 (patch)
tree8e979b0a30c78d155616e1d478c68637f39960b8
parent77aeac65013250b1bd3beccb4c2f6dc6d3138ac9 (diff)
parent67203f17e09da90a62d4ae8105c3de5b73c09951 (diff)
downloadspack-d905a1350ac939c70eb5f3742956d0dd0a219518.tar.gz
spack-d905a1350ac939c70eb5f3742956d0dd0a219518.tar.bz2
spack-d905a1350ac939c70eb5f3742956d0dd0a219518.tar.xz
spack-d905a1350ac939c70eb5f3742956d0dd0a219518.zip
Merge pull request #2 in SCALE/spack from zippackages to master
# By Matthew LeGendre # Via Matthew LeGendre * commit '67203f17e09da90a62d4ae8105c3de5b73c09951': Use unzip to unpackage .zip files
-rw-r--r--lib/spack/spack/util/compression.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/spack/spack/util/compression.py b/lib/spack/spack/util/compression.py
index ca98160bdd..2b8b05eb28 100644
--- a/lib/spack/spack/util/compression.py
+++ b/lib/spack/spack/util/compression.py
@@ -39,6 +39,9 @@ def allowed_archive(path):
def decompressor_for(path):
"""Get the appropriate decompressor for a path."""
+ if path.endswith(".zip"):
+ unzip = which('unzip', required=True)
+ return unzip
tar = which('tar', required=True)
tar.add_default_arg('-xf')
return tar