]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[#2534] Dynamic python ver detection
authorTomek Mrugalski <tomek@isc.org>
Fri, 26 Aug 2022 07:48:13 +0000 (09:48 +0200)
committerAndrei Pavel <andrei@isc.org>
Mon, 10 Jul 2023 06:24:34 +0000 (09:24 +0300)
 patch by Andrei Pavel

hammer.py

index 984fbaf8d78d51e12ce5e9248abf805dd5a09c4a..5e0c486998d9f8dbcd74a79ee71c5a53183ef7b7 100755 (executable)
--- a/hammer.py
+++ b/hammer.py
@@ -1762,16 +1762,11 @@ def prepare_system_local(features, check_times):
         packages = ['autoconf', 'automake', 'libtool', 'openssl', 'log4cplus', 'boost-libs', 'wget']
 
         if 'docs' in features:
-            # FreeBSD 11 and earlier should have python 3.7
-            # FreeBSD 12 seems to have python 3.8
-            # FreeBSD 13 has python 3.9
-            if float(revision.split('.')[0]) < 12.0:
-                packages.extend(['py37-sphinx', 'py37-sphinx_rtd_theme'])
-            else:
-                if revision.startswith(('12')):
-                    packages.extend(['py38-sphinx', 'py38-sphinx_rtd_theme'])
-                else:
-                    packages.extend(['py39-sphinx', 'py39-sphinx_rtd_theme'])
+            # Get the python version from the remote repositories.
+            _, output = execute("pkg search python | grep -Eo '^python-[0-9]+\.[0-9]+' | cut -d '-' -f 2 | tr -d '.'",
+                                capture=True)
+            pyv = output.strip()
+            packages.extend([f'py{pyv}-sphinx', f'py{pyv}-sphinx_rtd_theme'])
 
         if 'mysql' in features:
             if revision.startswith(('11', '12')):