Support github URLs
This commit is contained in:
parent
ab8e79fc2d
commit
40dda596a0
2 changed files with 5 additions and 1 deletions
|
@ -80,7 +80,7 @@ if args.mock:
|
||||||
|
|
||||||
# If the user asked for it, don't check ssl certs.
|
# If the user asked for it, don't check ssl certs.
|
||||||
if args.insecure:
|
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')
|
spack.curl.add_default_arg('-k')
|
||||||
|
|
||||||
# Try to load the particular command asked for and run it
|
# Try to load the particular command asked for and run it
|
||||||
|
|
|
@ -102,6 +102,9 @@ def parse_version_string_with_indices(path):
|
||||||
# e.g. https://github.com/petdance/ack/tarball/1.93_02
|
# e.g. https://github.com/petdance/ack/tarball/1.93_02
|
||||||
(r'github.com/.+/(?:zip|tar)ball/v?((\d+\.)+\d+_(\d+))$', path),
|
(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)
|
# e.g. https://github.com/erlang/otp/tarball/OTP_R15B01 (erlang style)
|
||||||
(r'[-_](R\d+[AB]\d*(-\d+)?)', path),
|
(r'[-_](R\d+[AB]\d*(-\d+)?)', path),
|
||||||
|
|
||||||
|
@ -169,6 +172,7 @@ def parse_name(path, ver=None):
|
||||||
ntypes = (r'/sourceforge/([^/]+)/',
|
ntypes = (r'/sourceforge/([^/]+)/',
|
||||||
r'/([^/]+)/(tarball|zipball)/',
|
r'/([^/]+)/(tarball|zipball)/',
|
||||||
r'/([^/]+)[_.-](bin|dist|stable|src|sources)[_.-]%s' % ver,
|
r'/([^/]+)[_.-](bin|dist|stable|src|sources)[_.-]%s' % ver,
|
||||||
|
r'github.com/[^/]+/([^/]+)/archive',
|
||||||
r'/([^/]+)[_.-]v?%s' % ver,
|
r'/([^/]+)[_.-]v?%s' % ver,
|
||||||
r'/([^/]+)%s' % ver,
|
r'/([^/]+)%s' % ver,
|
||||||
r'^([^/]+)[_.-]v?%s' % ver,
|
r'^([^/]+)[_.-]v?%s' % ver,
|
||||||
|
|
Loading…
Reference in a new issue