From c3cd948537dc357d4a5e227e9c2f8e85a7a7342d Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Sun, 25 Dec 2016 15:32:19 -0500
Subject: [PATCH] Modify github archive regex to support luaposix (#2677)
---
lib/spack/spack/test/url_parse.py | 5 +++++
lib/spack/spack/url.py | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/spack/spack/test/url_parse.py b/lib/spack/spack/test/url_parse.py
index 65b49faaa1..1466698dbf 100644
--- a/lib/spack/spack/test/url_parse.py
+++ b/lib/spack/spack/test/url_parse.py
@@ -345,3 +345,8 @@ def test_yorick_version(self):
self.check(
'yorick', '2_2_04',
'https://github.com/dhmunro/yorick/archive/y_2_2_04.tar.gz')
+
+ def test_luaposix_version(self):
+ self.check(
+ 'luaposix', '33.4.0',
+ 'https://github.com/luaposix/luaposix/archive/release-v33.4.0.tar.gz')
diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py
index aa3867b792..9043a5ad3e 100644
--- a/lib/spack/spack/url.py
+++ b/lib/spack/spack/url.py
@@ -193,7 +193,7 @@ def parse_version_offset(path, debug=False):
(r'github.com/[^/]+/yorick/archive/y_(\d+(?:_\d+)*)$', path),
# e.g. https://github.com/hpc/lwgrp/archive/v1.0.1.tar.gz
- (r'github.com/[^/]+/[^/]+/archive/v?(\w+(?:[.-]\w+)*)$', path),
+ (r'github.com/[^/]+/[^/]+/archive/(?:release-)?v?(\w+(?:[.-]\w+)*)$', path), # noqa
# e.g. https://github.com/erlang/otp/tarball/OTP_R15B01 (erlang style)
(r'[-_](R\d+[AB]\d*(-\d+)?)', path),
--
GitLab