diff options
author | dorier <dorier@users.noreply.github.com> | 2018-10-26 02:03:56 +0100 |
---|---|---|
committer | Peter Scheibel <scheibel1@llnl.gov> | 2018-10-25 18:03:56 -0700 |
commit | 3fc7dd160d91d54b60a688dc35102a109290ff01 (patch) | |
tree | 58636f34b3e7d7acd8b660b5b9e6099e3029448e | |
parent | 58b98738e1fc47925f098f1793d39a15941c71c2 (diff) | |
download | spack-3fc7dd160d91d54b60a688dc35102a109290ff01.tar.gz spack-3fc7dd160d91d54b60a688dc35102a109290ff01.tar.bz2 spack-3fc7dd160d91d54b60a688dc35102a109290ff01.tar.xz spack-3fc7dd160d91d54b60a688dc35102a109290ff01.zip |
updated URL format for Catalyst package when version is greater or equal to 5.6 (#9611)
-rw-r--r-- | var/spack/repos/builtin/packages/catalyst/package.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/var/spack/repos/builtin/packages/catalyst/package.py b/var/spack/repos/builtin/packages/catalyst/package.py index 40f72a125c..d9be7b17dd 100644 --- a/var/spack/repos/builtin/packages/catalyst/package.py +++ b/var/spack/repos/builtin/packages/catalyst/package.py @@ -16,7 +16,8 @@ class Catalyst(CMakePackage): homepage = 'http://www.paraview.org' url = "http://www.paraview.org/files/v5.5/ParaView-v5.5.2.tar.gz" - _urlfmt = 'http://www.paraview.org/files/v{0}/ParaView-v{1}{2}.tar.gz' + _urlfmt_gz = 'http://www.paraview.org/files/v{0}/ParaView-v{1}{2}.tar.gz' + _urlfmt_xz = 'http://www.paraview.org/files/v{0}/ParaView-v{1}{2}.tar.xz' version('5.5.2', '7eb93c31a1e5deb7098c3b4275e53a4a') version('5.5.1', 'a7d92a45837b67c3371006cc45163277') @@ -46,9 +47,11 @@ class Catalyst(CMakePackage): def url_for_version(self, version): """Handle ParaView version-based custom URLs.""" if version < Version('5.1.0'): - return self._urlfmt.format(version.up_to(2), version, '-source') + return self._urlfmt_gz.format(version.up_to(2), version, '-source') + elif version < Version('5.6.0'): + return self._urlfmt_gz.format(version.up_to(2), version, '') else: - return self._urlfmt.format(version.up_to(2), version, '') + return self._urlfmt_xz.format(version.up_to(2), version, '') def do_stage(self, mirror_only=False): """Unpacks and expands the fetched tarball. |