From 75e6e794fbb79ca452e13f874edc7cfd2f10041f Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Mon, 27 Oct 2014 21:32:31 -0700 Subject: Fix bug with extension() for sourceforge URLs. --- lib/spack/spack/util/compression.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/spack/spack/util/compression.py b/lib/spack/spack/util/compression.py index a67576bd50..b4db266fd3 100644 --- a/lib/spack/spack/util/compression.py +++ b/lib/spack/spack/util/compression.py @@ -23,6 +23,7 @@ # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ############################################################################## import re +import os from itertools import product from spack.util.executable import which @@ -60,6 +61,11 @@ def strip_extension(path): def extension(path): """Get the archive extension for a path.""" + + # Strip sourceforge suffix. + if re.search(r'((?:sourceforge.net|sf.net)/.*)/download$', path): + path = os.path.dirname(path) + for type in ALLOWED_ARCHIVE_TYPES: suffix = r'\.%s$' % type if re.search(suffix, path): -- cgit v1.2.3-60-g2f50