Introduce want_local_repo()

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index c60d6f17cc07dccd4eedd1962cb746ac7430ac38..1b318be04871b04114b5b2ee39a2633a0deb2167 100644 (file)
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -557,7 +557,7 @@ def run_build_scripts(context: Context) -> None:
                     ) + (chroot if script.suffix == ".chroot" else []),
                 )
 
-    if any(context.packages.iterdir()):
+    if context.want_local_repo():
         with complete_step("Rebuilding local package repository"):
             context.config.distribution.createrepo(context)
 

diff --git a/mkosi/context.py b/mkosi/context.py
index d668a249ec4fcaf14ab3f3f3e4cf7e62f2ce9b68..4214c421d961b3c37eda13991eb449bef724dc56 100644 (file)
--- a/mkosi/context.py
+++ b/mkosi/context.py
@@ -93,3 +93,6 @@ class Context:
                 f"mount -t overlay -o lowerdir={self.pkgmngr / 'usr'}:/usr overlayfs /usr && exec $0 \"$@\"",
             ] if (self.pkgmngr / "usr").exists() else []
         )
+
+    def want_local_repo(self) -> bool:
+        return any(self.packages.iterdir())

diff --git a/mkosi/distributions/arch.py b/mkosi/distributions/arch.py
index 90b3f4bb53c6aaec2659cd2071c9911205682b3f..b9ed80c4f37c502a46fd0d5330f165c6697a2c39 100644 (file)
--- a/mkosi/distributions/arch.py
+++ b/mkosi/distributions/arch.py
@@ -67,7 +67,7 @@ class Installer(DistributionInstaller):
         if context.config.local_mirror:
             yield PacmanRepository("core", context.config.local_mirror)
         else:
-            if any(context.packages.iterdir()):
+            if context.want_local_repo():
                 yield localrepo_pacman()
 
             if context.config.architecture == Architecture.arm64:

diff --git a/mkosi/distributions/centos.py b/mkosi/distributions/centos.py
index b6947aca26000ca4bc7a7c1b7dca1da0a7fd362d..db92a61948b0e791ba5b90e476a46c389157a748 100644 (file)
--- a/mkosi/distributions/centos.py
+++ b/mkosi/distributions/centos.py
@@ -223,7 +223,7 @@ class Installer(DistributionInstaller):
             yield from cls.repository_variants(context, "AppStream")
             return
 
-        if any(context.packages.iterdir()):
+        if context.want_local_repo():
             yield localrepo_dnf()
 
         yield from cls.repository_variants(context, "BaseOS")

diff --git a/mkosi/distributions/debian.py b/mkosi/distributions/debian.py
index 5684a68e80b38ab7f3ea2d0ac6837ec00c3d5fe4..dfdc3b9a364f47efd479a38c568e3cf63b4eb32f 100644 (file)
--- a/mkosi/distributions/debian.py
+++ b/mkosi/distributions/debian.py
@@ -52,7 +52,7 @@ class Installer(DistributionInstaller):
             )
             return
 
-        if any(context.packages.iterdir()):
+        if context.want_local_repo():
             yield localrepo_apt(context)
 
         mirror = context.config.mirror or "http://deb.debian.org/debian"

diff --git a/mkosi/distributions/fedora.py b/mkosi/distributions/fedora.py
index 1e86d8601e2d3879aafe63d0182ffa609460b570..d8dcbffb272f242a2c4b59b6b483a5add4cffe0d 100644 (file)
--- a/mkosi/distributions/fedora.py
+++ b/mkosi/distributions/fedora.py
@@ -74,7 +74,7 @@ class Installer(DistributionInstaller):
             yield RpmRepository("fedora", f"baseurl={context.config.local_mirror}", gpgurls)
             return
 
-        if any(context.packages.iterdir()):
+        if context.want_local_repo():
             yield localrepo_dnf()
 
         if context.config.release == "eln":

diff --git a/mkosi/distributions/mageia.py b/mkosi/distributions/mageia.py
index ddfee44a3190d5195f488c95969b10dc4c469f42..c6622d9fd4f43e2bbda9001b3c7ea4e5636b7536 100644 (file)
--- a/mkosi/distributions/mageia.py
+++ b/mkosi/distributions/mageia.py
@@ -52,7 +52,7 @@ class Installer(fedora.Installer):
             yield RpmRepository("core-release", f"baseurl={context.config.local_mirror}", gpgurls)
             return
 
-        if any(context.packages.iterdir()):
+        if context.want_local_repo():
             yield localrepo_dnf()
 
         if context.config.mirror:

diff --git a/mkosi/distributions/openmandriva.py b/mkosi/distributions/openmandriva.py
index c1b682fa02fab7fcbd5930277ec4ba2ae2301639..e2c1913385276a63cfe9622ebde741f9456bd29b 100644 (file)
--- a/mkosi/distributions/openmandriva.py
+++ b/mkosi/distributions/openmandriva.py
@@ -58,7 +58,7 @@ class Installer(fedora.Installer):
             yield RpmRepository("main-release", f"baseurl={context.config.local_mirror}", gpgurls)
             return
 
-        if any(context.packages.iterdir()):
+        if context.want_local_repo():
             yield localrepo_dnf()
 
         url = f"baseurl={join_mirror(mirror, '$releasever/repository/$basearch/main')}"

diff --git a/mkosi/distributions/opensuse.py b/mkosi/distributions/opensuse.py
index ade8ffe96f3b698b5698ead535fc61a57b689ca9..72ba283c0df2afac3b1a0e1b5e52926687ff213c 100644 (file)
--- a/mkosi/distributions/opensuse.py
+++ b/mkosi/distributions/opensuse.py
@@ -82,7 +82,7 @@ class Installer(DistributionInstaller):
     def repositories(cls, context: Context) -> Iterable[RpmRepository]:
         zypper = find_binary("zypper", root=context.config.tools())
 
-        if any(context.packages.iterdir()):
+        if context.want_local_repo():
             yield localrepo_zypper() if zypper else localrepo_dnf()
 
         release = context.config.release

diff --git a/mkosi/distributions/ubuntu.py b/mkosi/distributions/ubuntu.py
index f31269ab0e5a6bb0a896027f27e5b2dc535244e9..8f1bb593f2a4ed10f38461a41d4eec1a0cde04b8 100644 (file)
--- a/mkosi/distributions/ubuntu.py
+++ b/mkosi/distributions/ubuntu.py
@@ -36,7 +36,7 @@ class Installer(debian.Installer):
             )
             return
 
-        if any(context.packages.iterdir()):
+        if context.want_local_repo():
             yield localrepo_apt(context)
 
         if context.config.architecture in (Architecture.x86, Architecture.x86_64):