diff options
author | Todd Gamblin <tgamblin@llnl.gov> | 2014-03-13 14:50:38 -0700 |
---|---|---|
committer | Gregory L. Lee <lee218@llnl.gov> | 2014-03-14 08:42:07 -0700 |
commit | 40dda596a016c8d3bd570e1f0f28bc4a0635ca3e (patch) | |
tree | c844a3010bc0724c496553925c7e9b8a20efb9ac | |
parent | ab8e79fc2d183dd434dc05d2522166645f1fbb36 (diff) | |
download | spack-40dda596a016c8d3bd570e1f0f28bc4a0635ca3e.tar.gz spack-40dda596a016c8d3bd570e1f0f28bc4a0635ca3e.tar.bz2 spack-40dda596a016c8d3bd570e1f0f28bc4a0635ca3e.tar.xz spack-40dda596a016c8d3bd570e1f0f28bc4a0635ca3e.zip |
Support github URLs
-rwxr-xr-x | bin/spack | 2 | ||||
-rw-r--r-- | lib/spack/spack/url.py | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -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, |