From: Aleš Mrázek <ales.mrazek@nic.cz>
Date: Mon, 26 Aug 2024 16:37:22 +0000 (+0200)
Subject: python: knot_resolver_build_options module added
X-Git-Tag: v6.0.9~18^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae215592fc0b9c349e95373347ec8b0a5f350885;p=thirdparty%2Fknot-resolver.git

python: knot_resolver_build_options module added
---

diff --git a/python/knot_resolver/manager/constants.py b/python/knot_resolver/manager/constants.py
index 832d3fa9b..5a7317a59 100644
--- a/python/knot_resolver/manager/constants.py
+++ b/python/knot_resolver/manager/constants.py
@@ -5,10 +5,10 @@ from typing import TYPE_CHECKING, Optional
 
 # Install config is semi-optional - only needed to actually run Manager, but not
 # for its unit tests.
-if importlib.util.find_spec("knot_resolver"):
-    import knot_resolver  # type: ignore[import-not-found]
+if importlib.util.find_spec("knot_resolver_build_options"):
+    import knot_resolver_build_options  # type: ignore[import-not-found]
 else:
-    knot_resolver = None
+    knot_resolver_build_options = None
 
 if TYPE_CHECKING:
     from knot_resolver.manager.config_store import ConfigStore
@@ -26,13 +26,13 @@ MAX_WORKERS = 256
 
 
 def kresd_executable() -> Path:
-    assert knot_resolver is not None
-    return knot_resolver.sbin_dir / "kresd"
+    assert knot_resolver_build_options is not None
+    return knot_resolver_build_options.sbin_dir / "kresd"
 
 
 def kres_gc_executable() -> Path:
-    assert knot_resolver is not None
-    return knot_resolver.sbin_dir / "kres-cache-gc"
+    assert knot_resolver_build_options is not None
+    return knot_resolver_build_options.sbin_dir / "kres-cache-gc"
 
 
 def kresd_user():
diff --git a/python/knot_resolver.py.in b/python/knot_resolver_build_options.py.in
similarity index 100%
rename from python/knot_resolver.py.in
rename to python/knot_resolver_build_options.py.in
diff --git a/python/meson.build b/python/meson.build
index c6b2a27ed..4be61235c 100644
--- a/python/meson.build
+++ b/python/meson.build
@@ -13,8 +13,8 @@ python_config.set('user', user)
 python_config.set('group', group)
 
 configure_file(
-  input: 'knot_resolver.py.in',
-  output: 'knot_resolver.py',
+  input: 'knot_resolver_build_options.py.in',
+  output: 'knot_resolver_build_options.py',
   configuration: python_config,
 )
 
diff --git a/python/setup.py.in b/python/setup.py.in
index 07b71454a..57f9a6846 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -2,11 +2,11 @@ from setuptools import setup
 
 # TODO: Migrate this to a pyproject.toml once Debian 11 support is dropped.
 setup(
-    name="knot_resolver",
+    name="knot_resolver_build_options",
     version="@kres_version@",
     description="Knot Resolver helper data for Python",
     author="Oto Šťáva",
     author_email="oto.stava@nic.cz",
     python_requires=">=3.8,<4.0",
-    py_modules=["knot_resolver"],
+    py_modules=["knot_resolver_build_options"],
 )