Fix bug with extension() for sourceforge URLs.
This commit is contained in:
parent
ee50a4ccce
commit
75e6e794fb
@ -23,6 +23,7 @@
|
|||||||
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||||
##############################################################################
|
##############################################################################
|
||||||
import re
|
import re
|
||||||
|
import os
|
||||||
from itertools import product
|
from itertools import product
|
||||||
from spack.util.executable import which
|
from spack.util.executable import which
|
||||||
|
|
||||||
@ -60,6 +61,11 @@ def strip_extension(path):
|
|||||||
|
|
||||||
def extension(path):
|
def extension(path):
|
||||||
"""Get the archive extension for a 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:
|
for type in ALLOWED_ARCHIVE_TYPES:
|
||||||
suffix = r'\.%s$' % type
|
suffix = r'\.%s$' % type
|
||||||
if re.search(suffix, path):
|
if re.search(suffix, path):
|
||||||
|
Loading…
Reference in New Issue
Block a user