From b33f92da34ba122d24111a5d531e10e4d576d9ac Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Wed, 26 Jul 2017 17:43:54 -0500 Subject: Improve version detection for URLs with dynamic after version (#4902) --- lib/spack/spack/test/url_parse.py | 4 +++- lib/spack/spack/url.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/spack/spack/test/url_parse.py b/lib/spack/spack/test/url_parse.py index 6789bc0aa3..41a2fda649 100644 --- a/lib/spack/spack/test/url_parse.py +++ b/lib/spack/spack/test/url_parse.py @@ -107,7 +107,9 @@ from spack.url import * # Combinations of multiple patterns - public ('dakota-6.3-public.src', 'dakota-6.3'), # Combinations of multiple patterns - universal - ('synergy-1.3.6p2-MacOSX-Universal', 'synergy-1.3.6p2') + ('synergy-1.3.6p2-MacOSX-Universal', 'synergy-1.3.6p2'), + # Combinations of multiple patterns - dynamic + ('snptest_v2.5.2_linux_x86_64_dynamic', 'snptest_v2.5.2'), ]) def test_url_strip_version_suffixes(url, expected): stripped = strip_version_suffixes(url) diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py index d29ce3d07f..e3da753a76 100644 --- a/lib/spack/spack/url.py +++ b/lib/spack/spack/url.py @@ -177,6 +177,7 @@ def strip_version_suffixes(path): '[Uu]niversal', 'jar', 'complete', + 'dynamic', 'oss', 'gem', 'tar', -- cgit v1.2.3-60-g2f50