From: Andrei Pavel Date: Wed, 7 May 2025 09:10:47 +0000 (+0300) Subject: Hammer: Make sure we account for the case when hammer is called on another Kea source... X-Git-Tag: Kea-2.6.3~26 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=5cad02bf6c249e3ee54c3b971ae1edbc74392d67;p=thirdparty%2Fkea.git Hammer: Make sure we account for the case when hammer is called on another Kea source tree when installing SSL keys --- diff --git a/hammer.py b/hammer.py index db3f3b87ea..417b6b178c 100755 --- a/hammer.py +++ b/hammer.py @@ -1311,12 +1311,17 @@ def _configure_mysql(system, revision, features): if 'tls' in features: if not os.path.isdir(cert_dir): execute('sudo mkdir -p {}'.format(cert_dir)) + # Parent dir of hammer.py. + p = os.path.dirname(os.path.realpath(os.path.abspath(sys.argv[0]))) + if not os.path.isdir(f'{p}/src/lib/asiolink/testutils/ca'): + # Sometimes we call a standalone hammer.py on another Kea source tree. Let's use cwd in that case. + p = '.' for file in [ - './src/lib/asiolink/testutils/ca/kea-ca.crt', - './src/lib/asiolink/testutils/ca/kea-client.crt', - './src/lib/asiolink/testutils/ca/kea-client.key', - './src/lib/asiolink/testutils/ca/kea-server.crt', - './src/lib/asiolink/testutils/ca/kea-server.key', + f'{p}/src/lib/asiolink/testutils/ca/kea-ca.crt', + f'{p}/src/lib/asiolink/testutils/ca/kea-client.crt', + f'{p}/src/lib/asiolink/testutils/ca/kea-client.key', + f'{p}/src/lib/asiolink/testutils/ca/kea-server.crt', + f'{p}/src/lib/asiolink/testutils/ca/kea-server.key', ]: if not os.path.exists(file): print('ERROR: File {} is needed to prepare TLS.'.format(file), file=sys.stderr)