Remove sync() method from distribution implementations

Instead, let's just use the method on the package manager object
directly.

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 74e20fe3009fc3efeb4fec7fa3bb50239c98c736..1ac192211d19bfecef60bb8795e4c576312f3b26 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -3711,7 +3711,7 @@ def sync_repository_metadata(context: Context) -> None:
             flock(context.config.package_cache_dir_or_default() / "cache" / subdir),
             flock(context.config.package_cache_dir_or_default() / "lib" / subdir),
         ):
-            context.config.distribution.sync(context)
+            context.config.distribution.package_manager(context.config).sync(context)
 
 
 def run_sync(args: Args, config: Config, *, resources: Path) -> None:

diff --git a/mkosi/distributions/__init__.py b/mkosi/distributions/__init__.py
index 03aeed8b9a2d0a077f3452bcad9814be0260ad48..80a408f0ab63f1d0ca308e06b995b7a7157f9df5 100644 (file)
--- a/mkosi/distributions/__init__.py
+++ b/mkosi/distributions/__init__.py
@@ -76,10 +76,6 @@ class DistributionInstaller:
     def createrepo(cls, context: "Context") -> None:
         raise NotImplementedError
 
-    @classmethod
-    def sync(cls, context: "Context") -> None:
-        raise NotImplementedError
-
 
 class Distribution(StrEnum):
     # Please consult docs/distribution-policy.md and contact one
@@ -161,9 +157,6 @@ class Distribution(StrEnum):
     def createrepo(self, context: "Context") -> None:
         return self.installer().createrepo(context)
 
-    def sync(self, context: "Context") -> None:
-        return self.installer().sync(context)
-
     def installer(self) -> type[DistributionInstaller]:
         modname = str(self).replace('-', '_')
         mod = importlib.import_module(f"mkosi.distributions.{modname}")

diff --git a/mkosi/distributions/arch.py b/mkosi/distributions/arch.py
index cc696adddb432719b5eab882906254265ae2f3cd..de2efb10c2f9a63b3884d8ffa3ae1d793e838f1f 100644 (file)
--- a/mkosi/distributions/arch.py
+++ b/mkosi/distributions/arch.py
@@ -44,10 +44,6 @@ class Installer(DistributionInstaller):
     def setup(cls, context: Context) -> None:
         Pacman.setup(context, cls.repositories(context))
 
-    @classmethod
-    def sync(cls, context: Context) -> None:
-        Pacman.sync(context)
-
     @classmethod
     def install(cls, context: Context) -> None:
         cls.install_packages(context, ["filesystem"], apivfs=False)

diff --git a/mkosi/distributions/centos.py b/mkosi/distributions/centos.py
index d98b6ebedd0ce272322b86aa860a1e72a8ebef24..1a4f84654aeb9f005f95984a4e7c6f414e35b656 100644 (file)
--- a/mkosi/distributions/centos.py
+++ b/mkosi/distributions/centos.py
@@ -77,10 +77,6 @@ class Installer(DistributionInstaller):
         (context.pkgmngr / "etc/dnf/vars/stream").write_text(f"{context.config.release}-stream\n")
         setup_rpm(context, dbpath=cls.dbpath(context))
 
-    @classmethod
-    def sync(cls, context: Context) -> None:
-        Dnf.sync(context)
-
     @classmethod
     def install(cls, context: Context) -> None:
         # Make sure glibc-minimal-langpack is installed instead of glibc-all-langpacks.

diff --git a/mkosi/distributions/custom.py b/mkosi/distributions/custom.py
index 0439a5eb25dd270896d3417af21a55c306c8befd..6661fe9a5a13c9380be6fde3f2ced901302d3abe 100644 (file)
--- a/mkosi/distributions/custom.py
+++ b/mkosi/distributions/custom.py
@@ -22,10 +22,6 @@ class Installer(DistributionInstaller):
     def setup(cls, context: Context) -> None:
         pass
 
-    @classmethod
-    def sync(cls, context: Context) -> None:
-        pass
-
     @classmethod
     def install(cls, context: Context) -> None:
         pass

diff --git a/mkosi/distributions/debian.py b/mkosi/distributions/debian.py
index e67d4ab5f2b812feb7f57eb2e43c42317143b84d..568e8d2587e399d81ad59796f264d157edd2fc99 100644 (file)
--- a/mkosi/distributions/debian.py
+++ b/mkosi/distributions/debian.py
@@ -107,10 +107,6 @@ class Installer(DistributionInstaller):
     def createrepo(cls, context: Context) -> None:
         Apt.createrepo(context)
 
-    @classmethod
-    def sync(cls, context: Context) -> None:
-        Apt.sync(context)
-
     @classmethod
     def install(cls, context: Context) -> None:
         # Instead of using debootstrap, we replicate its core functionality here. Because dpkg does not have

diff --git a/mkosi/distributions/fedora.py b/mkosi/distributions/fedora.py
index 05bea47e4e9813e46496ee8ccf8dcf36ec50f58b..b8924fe273c468c8a5628d39b009ae72f1c0f7b7 100644 (file)
--- a/mkosi/distributions/fedora.py
+++ b/mkosi/distributions/fedora.py
@@ -83,10 +83,6 @@ class Installer(DistributionInstaller):
         Dnf.setup(context, cls.repositories(context), filelists=False)
         setup_rpm(context)
 
-    @classmethod
-    def sync(cls, context: Context) -> None:
-        Dnf.sync(context)
-
     @classmethod
     def install(cls, context: Context) -> None:
         cls.install_packages(context, ["filesystem"], apivfs=False)

diff --git a/mkosi/distributions/opensuse.py b/mkosi/distributions/opensuse.py
index ac5994e5e631df9ddfc88765fc715284823f732f..b37bc72b2d69233b52ae1027d7c2a8fb9c3a276b 100644 (file)
--- a/mkosi/distributions/opensuse.py
+++ b/mkosi/distributions/opensuse.py
@@ -67,13 +67,6 @@ class Installer(DistributionInstaller):
 
         setup_rpm(context)
 
-    @classmethod
-    def sync(cls, context: Context) -> None:
-        if find_binary("zypper", root=context.config.tools()):
-            Zypper.sync(context)
-        else:
-            Dnf.sync(context)
-
     @classmethod
     def install(cls, context: Context) -> None:
         cls.install_packages(context, ["filesystem", "distribution-release"], apivfs=False)

diff --git a/mkosi/installer/__init__.py b/mkosi/installer/__init__.py
index 7e8fdce2603108e17a1ca7cd95265b0c65fd95b0..3a430c79f5376112869c77842651b14b58b6e891 100644 (file)
--- a/mkosi/installer/__init__.py
+++ b/mkosi/installer/__init__.py
@@ -61,6 +61,10 @@ class PackageManager:
 
         return mounts
 
+    @classmethod
+    def sync(cls, context: Context) -> None:
+        pass
+
 
 def clean_package_manager_metadata(context: Context) -> None:
     """