diff options
| author | Michal Nowikowski <godfryd@isc.org> | 2021-06-08 16:03:51 +0200 |
|---|---|---|
| committer | Michal Nowikowski <godfryd@isc.org> | 2021-06-08 16:03:51 +0200 |
| commit | c5a238a641b35eb710d496e73cd8041bee67d537 (patch) | |
| tree | ebaa01013fc9a16a3e422382b14cd2aea869c7cf /hammer.py | |
| parent | hammer: added support for building kea on alpine 3.13, ubuntu 21.04, fedora 3... (diff) | |
| download | kea-c5a238a641b35eb710d496e73cd8041bee67d537.tar.xz kea-c5a238a641b35eb710d496e73cd8041bee67d537.zip | |
[#1658] addressed review issues
Diffstat (limited to 'hammer.py')
| -rwxr-xr-x | hammer.py | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -1497,22 +1497,22 @@ def prepare_system_local(features, check_times): packages = ['autoconf', 'automake', 'libtool', 'openssl', 'log4cplus', 'boost-libs', 'wget'] if 'docs' in features: - if revision.startswith('13'): - packages.extend(['py38-sphinx', 'py38-sphinx_rtd_theme']) - else: + if revision.startswith(('11', '12')): packages.extend(['py37-sphinx', 'py37-sphinx_rtd_theme']) + else: + packages.extend(['py38-sphinx', 'py38-sphinx_rtd_theme']) if 'mysql' in features: - if revision.startswith('13'): - packages.extend(['mysql80-server', 'mysql80-client']) - else: + if revision.startswith(('11', '12')): packages.extend(['mysql57-server', 'mysql57-client']) + else: + packages.extend(['mysql80-server', 'mysql80-client']) if 'pgsql' in features: - if revision.startswith('13'): - packages.extend(['postgresql14-server', 'postgresql14-client']) - else: + if revision.startswith(('11', '12')): packages.extend(['postgresql11-server', 'postgresql11-client']) + else: + packages.extend(['postgresql14-server', 'postgresql14-client']) if 'radius' in features: packages.extend(['git']) |