From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 8 Jun 2023 16:51:30 +0000 (+0200)
Subject: arch: Introduce setup_pacman()
X-Git-Tag: v15~118^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b57cb5b4fd9c0c3ffa1fb17c536343f76ddb554;p=thirdparty%2Fmkosi.git

arch: Introduce setup_pacman()
---

diff --git a/mkosi/distributions/arch.py b/mkosi/distributions/arch.py
index cb7e90d51..c8c6d1166 100644
--- a/mkosi/distributions/arch.py
+++ b/mkosi/distributions/arch.py
@@ -24,91 +24,94 @@ class ArchInstaller(DistributionInstaller):
 
     @classmethod
     def install_packages(cls, state: MkosiState, packages: Sequence[str], apivfs: bool = True) -> None:
-        assert state.config.mirror
+        setup_pacman(state)
+        invoke_pacman(state, packages, apivfs=apivfs)
 
-        if state.config.local_mirror:
-            server = f"Server = {state.config.local_mirror}"
-        else:
-            if state.config.architecture == Architecture.arm64:
-                server = f"Server = {state.config.mirror}/$arch/$repo"
-            else:
-                server = f"Server = {state.config.mirror}/$repo/os/$arch"
+    @staticmethod
+    def architecture(arch: Architecture) -> str:
+        a = {
+            Architecture.x86_64 : "x86_64",
+            Architecture.arm64  : "aarch64",
+        }.get(arch)
 
-        # Create base layout for pacman and pacman-key
-        state.root.joinpath("var/lib/pacman").mkdir(mode=0o755, exist_ok=True, parents=True)
+        if not a:
+            die(f"Architecture {a} is not supported by Arch Linux")
 
-        pacman_conf = state.pkgmngr / "etc/pacman.conf"
-        pacman_conf.parent.mkdir(mode=0o755, exist_ok=True, parents=True)
+        return a
 
-        if state.config.repository_key_check:
-            sig_level = "Required DatabaseOptional"
+
+def setup_pacman(state: MkosiState) -> None:
+    assert state.config.mirror
+
+    if state.config.local_mirror:
+        server = f"Server = {state.config.local_mirror}"
+    else:
+        if state.config.architecture == Architecture.arm64:
+            server = f"Server = {state.config.mirror}/$arch/$repo"
         else:
-            # If we are using a single local mirror built on the fly there
-            # will be no signatures
-            sig_level = "Never"
+            server = f"Server = {state.config.mirror}/$repo/os/$arch"
+
+    if state.config.repository_key_check:
+        sig_level = "Required DatabaseOptional"
+    else:
+        # If we are using a single local mirror built on the fly there
+        # will be no signatures
+        sig_level = "Never"
+
+    # Create base layout for pacman and pacman-key
+    state.root.joinpath("var/lib/pacman").mkdir(mode=0o755, exist_ok=True, parents=True)
+
+    config = state.pkgmngr / "etc/pacman.conf"
+    config.parent.mkdir(mode=0o755, exist_ok=True, parents=True)
+
+    with config.open("w") as f:
+        gpgdir = state.pkgmngr / "etc/pacman.d/gnupg/"
+        gpgdir = gpgdir if gpgdir.exists() else "/etc/pacman.d/gnupg/"
+        f.write(
+            dedent(
+                f"""\
+                [options]
+                RootDir = {state.root}
+                LogFile = /dev/null
+                CacheDir = {state.cache_dir}
+                GPGDir = {gpgdir}
+                HookDir = {state.root}/etc/pacman.d/hooks/
+                HoldPkg = pacman glibc
+                Architecture = {state.installer.architecture(state.config.architecture)}
+                Color
+                CheckSpace
+                SigLevel = {sig_level}
+                ParallelDownloads = 5
+
+                [core]
+                {server}
+                """
+            )
+        )
 
-        with pacman_conf.open("w") as f:
-            gpgdir = state.pkgmngr / "etc/pacman.d/gnupg/"
-            gpgdir = gpgdir if gpgdir.exists() else "/etc/pacman.d/gnupg/"
+        if not state.config.local_mirror:
             f.write(
                 dedent(
                     f"""\
-                    [options]
-                    RootDir = {state.root}
-                    LogFile = /dev/null
-                    CacheDir = {state.cache_dir}
-                    GPGDir = {gpgdir}
-                    HookDir = {state.root}/etc/pacman.d/hooks/
-                    HoldPkg = pacman glibc
-                    Architecture = {state.installer.architecture(state.config.architecture)}
-                    Color
-                    CheckSpace
-                    SigLevel = {sig_level}
-                    ParallelDownloads = 5
-
-                    [core]
+
+                    [extra]
+                    {server}
+
+                    [community]
                     {server}
                     """
                 )
             )
 
-            if not state.config.local_mirror:
-                f.write(
-                    dedent(
-                        f"""\
-
-                        [extra]
-                        {server}
-
-                        [community]
-                        {server}
-                        """
-                    )
-                )
-
-            if any(state.pkgmngr.joinpath("etc/pacman.d/").glob("*.conf")):
-                f.write(
-                    dedent(
-                        f"""\
+        if any(state.pkgmngr.joinpath("etc/pacman.d/").glob("*.conf")):
+            f.write(
+                dedent(
+                    f"""\
 
-                        Include = {state.pkgmngr}/etc/pacman.d/*.conf
-                        """
-                    )
+                    Include = {state.pkgmngr}/etc/pacman.d/*.conf
+                    """
                 )
-
-        return invoke_pacman(state, packages, apivfs=apivfs)
-
-    @staticmethod
-    def architecture(arch: Architecture) -> str:
-        a = {
-            Architecture.x86_64 : "x86_64",
-            Architecture.arm64  : "aarch64",
-        }.get(arch)
-
-        if not a:
-            die(f"Architecture {a} is not supported by Arch Linux")
-
-        return a
+            )
 
 
 def invoke_pacman(state: MkosiState, packages: Sequence[str], apivfs: bool = True) -> None: