From: Joerg Behrmann <behrmann@physik.fu-berlin.de>
Date: Wed, 7 Jun 2023 16:33:40 +0000 (+0200)
Subject: arch: use GPGDir in package manager tree if it exists
X-Git-Tag: v15~120^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1618%2Fhead;p=thirdparty%2Fmkosi.git

arch: use GPGDir in package manager tree if it exists
---

diff --git a/mkosi/distributions/arch.py b/mkosi/distributions/arch.py
index 8016b2563..cb7e90d51 100644
--- a/mkosi/distributions/arch.py
+++ b/mkosi/distributions/arch.py
@@ -48,6 +48,8 @@ class ArchInstaller(DistributionInstaller):
             sig_level = "Never"
 
         with pacman_conf.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"""\
@@ -55,7 +57,7 @@ class ArchInstaller(DistributionInstaller):
                     RootDir = {state.root}
                     LogFile = /dev/null
                     CacheDir = {state.cache_dir}
-                    GPGDir = /etc/pacman.d/gnupg/
+                    GPGDir = {gpgdir}
                     HookDir = {state.root}/etc/pacman.d/hooks/
                     HoldPkg = pacman glibc
                     Architecture = {state.installer.architecture(state.config.architecture)}