From 5fc0243d3598f6e0f6b3206ccfb91012675c8c41 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 18 Jul 2017 22:48:39 -0500 Subject: Improve version detection of release versions (#4816) --- lib/spack/spack/test/url_parse.py | 2 ++ lib/spack/spack/url.py | 1 + 2 files changed, 3 insertions(+) diff --git a/lib/spack/spack/test/url_parse.py b/lib/spack/spack/test/url_parse.py index 5b24821a28..6789bc0aa3 100644 --- a/lib/spack/spack/test/url_parse.py +++ b/lib/spack/spack/test/url_parse.py @@ -57,6 +57,8 @@ from spack.url import * ('gromacs-4.6.1-tar', 'gromacs-4.6.1'), # Download type - sh ('Miniconda2-4.3.11-Linux-x86_64.sh', 'Miniconda2-4.3.11'), + # Download version - release + ('v1.0.4-release', 'v1.0.4'), # Download version - stable ('libevent-2.0.21-stable', 'libevent-2.0.21'), # Download version - final diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py index 88557596fd..d29ce3d07f 100644 --- a/lib/spack/spack/url.py +++ b/lib/spack/spack/url.py @@ -183,6 +183,7 @@ def strip_version_suffixes(path): 'sh', # Download version + 'release', 'stable', '[Ff]inal', 'rel', -- cgit v1.2.3-70-g09d2