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

2018-05-20 15:01:58 -05:00 · 2018-05-20 15:01:58 -05:00 · 0ccbc3a479
commit 0ccbc3a479
parent 0a47db5088
2 changed files with 4 additions and 2 deletions
--- a/lib/spack/spack/test/url_parse.py
+++ b/lib/spack/spack/test/url_parse.py
@ -75,6 +75,8 @@
    ('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
--- 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)?',