From 0b34b8be3e56b0ea8060c1cc49d9cc1a9c8d0475 Mon Sep 17 00:00:00 2001 From: Andrei Pavel Date: Wed, 7 May 2025 12:10:47 +0300 Subject: [PATCH] Hammer: Make sure we account for the case when hammer is called on another Kea source tree when installing SSL keys --- hammer.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/hammer.py b/hammer.py index 27d8796278..9aa96c40ab 100755 --- a/hammer.py +++ b/hammer.py @@ -1278,12 +1278,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) -- 2.47.2