From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 22 Jan 2025 11:13:13 +0000 (+0100)
Subject: Move keyring_cache() and metadata_cache() next to cache_tree_paths()
X-Git-Tag: v25~12^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=682928fd275457b3e374c52eeef110a12cfb3e79;p=thirdparty%2Fmkosi.git

Move keyring_cache() and metadata_cache() next to cache_tree_paths()
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 51d0ca617..6d1ea1f1f 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2471,6 +2471,20 @@ def cache_tree_paths(config: Config) -> tuple[Path, Path, Path]:
     )
 
 
+def keyring_cache(config: Config) -> Path:
+    assert config.cache_dir
+    fragments = [config.distribution, config.release, config.architecture]
+
+    return config.cache_dir / f"{'~'.join(str(s) for s in fragments)}.keyring.cache"
+
+
+def metadata_cache(config: Config) -> Path:
+    assert config.cache_dir
+    fragments = [config.distribution, config.release, config.architecture]
+
+    return config.cache_dir / f"{'~'.join(str(s) for s in fragments)}.metadata.cache"
+
+
 def check_inputs(config: Config) -> None:
     """
     Make sure all the inputs exist that aren't checked during config parsing because they might
@@ -4477,20 +4491,6 @@ def ensure_directories_exist(config: Config) -> None:
             config.build_dir.chmod(stat.S_IMODE(st.st_mode) & ~(stat.S_ISGID | stat.S_ISUID))
 
 
-def keyring_cache(config: Config) -> Path:
-    assert config.cache_dir
-    fragments = [config.distribution, config.release, config.architecture]
-
-    return config.cache_dir / f"{'~'.join(str(s) for s in fragments)}.keyring.cache"
-
-
-def metadata_cache(config: Config) -> Path:
-    assert config.cache_dir
-    fragments = [config.distribution, config.release, config.architecture]
-
-    return config.cache_dir / f"{'~'.join(str(s) for s in fragments)}.metadata.cache"
-
-
 def sync_repository_metadata(
     args: Args,
     images: Sequence[Config],