zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

URL parsing: strip x86-64 from filename (#8200)

Browse Source
This commit is contained in:
Adam J. Stewart
2018-05-20 15:01:58 -05:00
committed by GitHub
parent 0a47db5088
commit 0ccbc3a479
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/spack/spack/test/url_parse.py
View File

@@ -75,6 +75,8 @@
('ncbi-blast-2.6.0+-src', 'ncbi-blast-2.6.0'), ('ncbi-blast-2.6.0+-src', 'ncbi-blast-2.6.0'),
# License # License
('cppad-20170114.gpl', 'cppad-20170114'), ('cppad-20170114.gpl', 'cppad-20170114'),
# Arch
('pcraster-4.1.0_x86-64', 'pcraster-4.1.0'),
# OS - linux # OS - linux
('astyle_2.04_linux', 'astyle_2.04'), ('astyle_2.04_linux', 'astyle_2.04'),
# OS - unix # OS - unix

4
lib/spack/spack/url.py
View File

@@ -206,7 +206,7 @@ def strip_version_suffixes(path):
'intel', 'intel',
'amd64', 'amd64',
'x64', 'x64',
'x86_64', 'x86[_-]64',
'x86', 'x86',
'i[36]86', 'i[36]86',
'ppc64(le)?', 'ppc64(le)?',
@@ -231,7 +231,7 @@ def strip_version_suffixes(path):
'intel', 'intel',
'amd64', 'amd64',
'x64', 'x64',
'x86_64', 'x86[_-]64',
'x86', 'x86',
'i[36]86', 'i[36]86',
'ppc64(le)?', 'ppc64(le)?',