From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 16 Apr 2025 07:35:41 +0000 (+0200)
Subject: Rename cache_subdirs() to package_subdirs()
X-Git-Tag: v26~241^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8bf8e4278cdd978083b5f9e91c78cbac1e7f25d;p=thirdparty%2Fmkosi.git

Rename cache_subdirs() to package_subdirs()

This method returns subdirs of the cache dir that contain packages
so package_subdirs() seems like a more approriate name.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index c282d3d50..5eda5fec1 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -3884,7 +3884,7 @@ def copy_repository_metadata(config: Config, dst: Path) -> None:
                 if d == "cache":
                     exclude = flatten(
                         ("--ro-bind", tmp, workdir(p))
-                        for p in config.distribution.package_manager(config).cache_subdirs(src)
+                        for p in config.distribution.package_manager(config).package_subdirs(src)
                     )
                 else:
                     exclude = flatten(
@@ -4853,7 +4853,7 @@ def sync_repository_metadata(
                 )
 
     src = last.package_cache_dir_or_default() / "cache" / subdir
-    for p in last.distribution.package_manager(last).cache_subdirs(src):
+    for p in last.distribution.package_manager(last).package_subdirs(src):
         p.mkdir(parents=True, exist_ok=True)
 
     # If we're in incremental mode and caching metadata is not explicitly disabled, cache the keyring and the
diff --git a/mkosi/installer/__init__.py b/mkosi/installer/__init__.py
index 5a49da680..fa7418ae0 100644
--- a/mkosi/installer/__init__.py
+++ b/mkosi/installer/__init__.py
@@ -22,7 +22,7 @@ class PackageManager:
         return Path("custom")
 
     @classmethod
-    def cache_subdirs(cls, cache: Path) -> list[Path]:
+    def package_subdirs(cls, cache: Path) -> list[Path]:
         return []
 
     @classmethod
@@ -85,7 +85,7 @@ class PackageManager:
             # configured package cache directory in this scenario, we mount in the relevant directories from
             # the configured package cache directory.
             if d == "cache" and context.metadata_dir != context.config.package_cache_dir_or_default():
-                caches = context.config.distribution.package_manager(context.config).cache_subdirs(src)
+                caches = context.config.distribution.package_manager(context.config).package_subdirs(src)
                 mounts += flatten(
                     (
                         "--bind",
diff --git a/mkosi/installer/apt.py b/mkosi/installer/apt.py
index becb6d38e..4750f7145 100644
--- a/mkosi/installer/apt.py
+++ b/mkosi/installer/apt.py
@@ -54,7 +54,7 @@ class Apt(PackageManager):
         return Path("apt")
 
     @classmethod
-    def cache_subdirs(cls, cache: Path) -> list[Path]:
+    def package_subdirs(cls, cache: Path) -> list[Path]:
         return [cache / "archives"]
 
     @classmethod
diff --git a/mkosi/installer/dnf.py b/mkosi/installer/dnf.py
index dec412932..ea4288283 100644
--- a/mkosi/installer/dnf.py
+++ b/mkosi/installer/dnf.py
@@ -25,7 +25,7 @@ class Dnf(PackageManager):
         return Path("libdnf5" if cls.executable(config) == "dnf5" else "dnf")
 
     @classmethod
-    def cache_subdirs(cls, cache: Path) -> list[Path]:
+    def package_subdirs(cls, cache: Path) -> list[Path]:
         return [
             p / "packages" for p in cache.iterdir() if p.is_dir() and "-" in p.name and "mkosi" not in p.name
         ]
diff --git a/mkosi/installer/pacman.py b/mkosi/installer/pacman.py
index 08d8e0f56..cc86de294 100644
--- a/mkosi/installer/pacman.py
+++ b/mkosi/installer/pacman.py
@@ -35,7 +35,7 @@ class Pacman(PackageManager):
         return Path("pacman")
 
     @classmethod
-    def cache_subdirs(cls, cache: Path) -> list[Path]:
+    def package_subdirs(cls, cache: Path) -> list[Path]:
         return [cache / "pkg"]
 
     @classmethod
diff --git a/mkosi/installer/zypper.py b/mkosi/installer/zypper.py
index f36c8af35..0f6c689be 100644
--- a/mkosi/installer/zypper.py
+++ b/mkosi/installer/zypper.py
@@ -23,7 +23,7 @@ class Zypper(PackageManager):
         return Path("zypp")
 
     @classmethod
-    def cache_subdirs(cls, cache: Path) -> list[Path]:
+    def package_subdirs(cls, cache: Path) -> list[Path]:
         return [cache / "packages"]
 
     @classmethod