From 4a9ecdfe156f9887d88eb7ae026387f0e051a6a5 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Sat, 17 Jan 2015 00:06:24 +0100
Subject: [PATCH] handle gnupg 2.1.x public keyring
---
makechrootpkg.in | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 466cb92..cc02547 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -153,10 +153,11 @@ prepare_chroot() {
echo 'BUILDDIR="/build"' >> "$copydir/etc/makepkg.conf"
fi
- # Read .makepkg.conf and .gnupg/pubring.gpg even if called via sudo
- if [[ -r "$USER_HOME/.gnupg/pubring.gpg" ]]; then
- install -D "$USER_HOME/.gnupg/pubring.gpg" \
- "$copydir/build/.gnupg/pubring.gpg"
+ # Read .makepkg.conf and gnupg pubring
+ if [[ -r $USER_HOME/.gnupg/pubring.kbx ]]; then
+ install -D "$USER_HOME/.gnupg/pubring.kbx" "$copydir/build/.gnupg/pubring.kbx"
+ elif [[ -r $USER_HOME/.gnupg/pubring.gpg ]]; then
+ install -D "$USER_HOME/.gnupg/pubring.gpg" "$copydir/build/.gnupg/pubring.gpg"
fi
mkdir -p "$copydir/pkgdest"
--
GitLab