diff options
| author | Adam J. Stewart <ajstewart426@gmail.com> | 2018-05-20 15:01:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-20 15:01:58 -0500 |
| commit | 0ccbc3a47929a0f20ee4d18d9e53d55a82bd441a (patch) | |
| tree | f9dfb68022c47e013df30214d5a751f78056f98d /lib | |
| parent | 0a47db508885427602d4d37ed0a8417840e4624a (diff) | |
| download | spack-0ccbc3a47929a0f20ee4d18d9e53d55a82bd441a.tar.gz spack-0ccbc3a47929a0f20ee4d18d9e53d55a82bd441a.tar.bz2 spack-0ccbc3a47929a0f20ee4d18d9e53d55a82bd441a.tar.xz spack-0ccbc3a47929a0f20ee4d18d9e53d55a82bd441a.zip | |
URL parsing: strip x86-64 from filename (#8200)
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/spack/spack/test/url_parse.py | 2 | ||||
| -rw-r--r-- | lib/spack/spack/url.py | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/spack/spack/test/url_parse.py b/lib/spack/spack/test/url_parse.py index d9b4352686..4a3550149d 100644 --- a/lib/spack/spack/test/url_parse.py +++ b/lib/spack/spack/test/url_parse.py @@ -75,6 +75,8 @@ from spack.version import Version ('ncbi-blast-2.6.0+-src', 'ncbi-blast-2.6.0'), # License ('cppad-20170114.gpl', 'cppad-20170114'), + # Arch + ('pcraster-4.1.0_x86-64', 'pcraster-4.1.0'), # OS - linux ('astyle_2.04_linux', 'astyle_2.04'), # OS - unix diff --git a/lib/spack/spack/url.py b/lib/spack/spack/url.py index 329772e17d..ed3867ba7b 100644 --- a/lib/spack/spack/url.py +++ b/lib/spack/spack/url.py @@ -206,7 +206,7 @@ def strip_version_suffixes(path): 'intel', 'amd64', 'x64', - 'x86_64', + 'x86[_-]64', 'x86', 'i[36]86', 'ppc64(le)?', @@ -231,7 +231,7 @@ def strip_version_suffixes(path): 'intel', 'amd64', 'x64', - 'x86_64', + 'x86[_-]64', 'x86', 'i[36]86', 'ppc64(le)?', |