From 77aeac65013250b1bd3beccb4c2f6dc6d3138ac9 Mon Sep 17 00:00:00 2001 From: Todd Gamblin Date: Thu, 13 Mar 2014 14:50:38 -0700 Subject: Support github URLs --- bin/spack | 2 +- lib/spack/spack/url.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bin/spack b/bin/spack index 420b9adc78..775a9dbd08 100755 --- a/bin/spack +++ b/bin/spack @@ -80,7 +80,7 @@ if args.mock: # If the user asked for it, don't check ssl certs. if args.insecure: - tty.warn("You asked for --insecure, which does not check SSL certificates. ") + tty.warn("You asked for --insecure, which does not check SSL certificates.") spack.curl.add_default_arg('-k') # Try to load the particular command asked for and run it diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py index 0bc7ff53b4..a4c32eb37b 100644 --- a/lib/spack/spack/url.py +++ b/lib/spack/spack/url.py @@ -102,6 +102,9 @@ def parse_version_string_with_indices(path): # e.g. https://github.com/petdance/ack/tarball/1.93_02 (r'github.com/.+/(?:zip|tar)ball/v?((\d+\.)+\d+_(\d+))$', path), + # e.g. https://github.com/hpc/lwgrp/archive/v1.0.1.tar.gz + (r'github.com/[^/]+/[^/]+/archive/v?(\d+(?:\.\d+)*)\.tar\.gz$', path), + # e.g. https://github.com/erlang/otp/tarball/OTP_R15B01 (erlang style) (r'[-_](R\d+[AB]\d*(-\d+)?)', path), @@ -169,6 +172,7 @@ def parse_name(path, ver=None): ntypes = (r'/sourceforge/([^/]+)/', r'/([^/]+)/(tarball|zipball)/', r'/([^/]+)[_.-](bin|dist|stable|src|sources)[_.-]%s' % ver, + r'github.com/[^/]+/([^/]+)/archive', r'/([^/]+)[_.-]v?%s' % ver, r'/([^/]+)%s' % ver, r'^([^/]+)[_.-]v?%s' % ver, -- cgit v1.2.3-60-g2f50