From a15c7f03b8eb62c620e3f324833bc2ff4b2036f3 Mon Sep 17 00:00:00 2001
From: Joerg Behrmann <behrmann@physik.fu-berlin.de>
Date: Wed, 7 Jun 2023 18:33:40 +0200
Subject: [PATCH] arch: use GPGDir in package manager tree if it exists

---
 mkosi/distributions/arch.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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)}
-- 
2.47.2