hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Various fixes to package name URL parsing (#4978)

Browse source
This commit is contained in:
Adam J. Stewart 2017-08-05 10:15:47 -05:00 committed by GitHub
parent c7df12f698
commit a31ce17f0b
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/spack/spack/cmd/url.py
View file

@ -334,6 +334,8 @@ def name_parsed_correctly(pkg, name):
pkg_name = pkg_name[2:] pkg_name = pkg_name[2:]
elif pkg_name.startswith('py-'): elif pkg_name.startswith('py-'):
pkg_name = pkg_name[3:] pkg_name = pkg_name[3:]
elif pkg_name.startswith('perl-'):
pkg_name = pkg_name[5:]
elif pkg_name.startswith('octave-'): elif pkg_name.startswith('octave-'):
pkg_name = pkg_name[7:] pkg_name = pkg_name[7:]

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

@ -124,6 +124,8 @@ def test_url_strip_version_suffixes(url, expected):
('converge_install_2.3.16', '2.3.16', 'converge'), ('converge_install_2.3.16', '2.3.16', 'converge'),
# Download type - src # Download type - src
('jpegsrc.v9b', '9b', 'jpeg'), ('jpegsrc.v9b', '9b', 'jpeg'),
# Download type - archive
('coinhsl-archive-2014.01.17', '2014.01.17', 'coinhsl'),
# Download type - std # Download type - std
('ghostscript-fonts-std-8.11', '8.11', 'ghostscript-fonts'), ('ghostscript-fonts-std-8.11', '8.11', 'ghostscript-fonts'),
# Download version - release # Download version - release

1
lib/spack/spack/url.py
View file

@ -290,6 +290,7 @@ def strip_name_suffixes(path, version):
'install', 'install',
'src', 'src',
'(open)?[Ss]ources?', '(open)?[Ss]ources?',
'[._-]archive',
'[._-]std', '[._-]std',
# Download version # Download version