From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 13 Apr 2025 19:42:24 +0000 (+0200)
Subject: Rename get_configdir() to finalize_configdir()
X-Git-Tag: v26~242^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87b03ee264e522b8a6bd34c299547efbaa63a012;p=thirdparty%2Fmkosi.git

Rename get_configdir() to finalize_configdir()
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index f4e562315..88f2214d3 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -71,8 +71,8 @@ from mkosi.config import (
     cat_config,
     dump_json,
     expand_delayed_specifiers,
+    finalize_configdir,
     format_bytes,
-    get_configdir,
     have_history,
     in_sandbox,
     parse_boolean,
@@ -4486,7 +4486,7 @@ def generate_key_cert_pair(args: Args) -> None:
     keylength = 2048
     expiration_date = datetime.date.today() + datetime.timedelta(int(args.genkey_valid_days))
 
-    configdir = get_configdir(args)
+    configdir = finalize_configdir(args)
 
     for f in (configdir / "mkosi.key", configdir / "mkosi.crt"):
         if f.exists() and not args.force:
diff --git a/mkosi/config.py b/mkosi/config.py
index 47cf16db4..79df20320 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -4971,7 +4971,7 @@ def finalize_default_tools(
     return Config.from_dict(context.finalize())
 
 
-def get_configdir(args: Args) -> Path:
+def finalize_configdir(args: Args) -> Path:
     """Allow locating all mkosi configuration in a mkosi/ subdirectory
     instead of in the top-level directory of a git repository.
     """
@@ -5077,7 +5077,7 @@ def parse_config(
 
     context.config["files"] = []
 
-    configdir = get_configdir(args)
+    configdir = finalize_configdir(args)
 
     # Parse the global configuration unless the user explicitly asked us not to.
     if args.directory is not None: