mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 14:05:33 +00:00
Code Issues Releases Wiki Activity

[#2539] hammer.py: defer linking of pg_config until after package is installed

Browse Source
This commit is contained in:
Andrei Pavel
2022-10-03 10:56:21 +03:00
parent 5f773fbfc0
commit 0097c9aafa
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
hammer.py
View File

@@ -1566,8 +1566,10 @@ def prepare_system_local(features, check_times):
packages.extend(['postgresql', 'postgresql-server'])
if revision == '9':
packages.append('postgresql13-devel')
if not os.path.exists('/usr/bin/pg_config'):
execute('sudo ln -s /usr/pgsql-13/bin/pg_config /usr/bin/pg_config')
def link_pg_config():
if not os.path.exists('/usr/bin/pg_config'):
execute('sudo ln -s /usr/pgsql-13/bin/pg_config /usr/bin/pg_config')
deferred_functions.append(link_pg_config)
else:
packages.append('postgresql-devel')
@@ -1628,8 +1630,10 @@ def prepare_system_local(features, check_times):
packages.extend(['postgresql', 'postgresql-server'])
if revision == '9':
packages.append('postgresql13-devel')
if not os.path.exists('/usr/bin/pg_config'):
execute('sudo ln -s /usr/pgsql-13/bin/pg_config /usr/bin/pg_config')
def link_pg_config():
if not os.path.exists('/usr/bin/pg_config'):
execute('sudo ln -s /usr/pgsql-13/bin/pg_config /usr/bin/pg_config')
deferred_functions.append(link_pg_config)
else:
packages.append('postgresql-devel')
@@ -2021,8 +2025,6 @@ def _build_binaries_and_run_ut(system, revision, features, tarball_path, env, ch
cmd += ' --with-mysql'
if 'pgsql' in features:
cmd += ' --with-pgsql'
if system == 'rhel' and revision == '9':
cmd += '=/usr/pgsql-14/bin/pg_config'
if 'unittest' in features:
# prepare gtest switch - use downloaded gtest sources only if it is not present as native package
if system in ['centos', 'fedora', 'rhel', 'freebsd', 'alpine']: