From 133dd7a4ac7b621df9d2296ec933c2b44bcac3ed Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Tue, 18 Sep 2018 21:29:18 -0500 Subject: Fix version parsing for cistem package (#9260) Adds 'code' to the list of suffixes that are excluded from version parsing of URLs, such that if a URL contains the string 'cistem-1.0.0-beta-source-code', a version X will substitute in to produce a URL with cistem-X-source-code ('source' was already excluded). The 'cistem' package version is updated to make use of this (and fix a fetching bug with the cistem package). A unit test is added to check this parsing case. --- lib/spack/spack/test/url_parse.py | 2 ++ lib/spack/spack/url.py | 1 + 2 files changed, 3 insertions(+) (limited to 'lib') diff --git a/lib/spack/spack/test/url_parse.py b/lib/spack/spack/test/url_parse.py index 4a3550149d..9603a91213 100644 --- a/lib/spack/spack/test/url_parse.py +++ b/lib/spack/spack/test/url_parse.py @@ -43,6 +43,8 @@ from spack.version import Version ('jpegsrc.v9b', 'jpegsrc.v9b'), ('turbolinux702', 'turbolinux702'), ('converge_install_2.3.16', 'converge_install_2.3.16'), + # Download type - code, source + ('cistem-1.0.0-beta-source-code', 'cistem-1.0.0-beta'), # Download type - src ('apache-ant-1.9.7-src', 'apache-ant-1.9.7'), ('go1.7.4.src', 'go1.7.4'), diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py index ed3867ba7b..ddcfe9c17e 100644 --- a/lib/spack/spack/url.py +++ b/lib/spack/spack/url.py @@ -169,6 +169,7 @@ def strip_version_suffixes(path): # Download type '[Ii]nstall', 'all', + 'code', 'src(_0)?', '[Ss]ources?', 'file', -- cgit v1.2.3-60-g2f50