fix handling of public keyring

Chances are that pubring.kbx has been created by gpgsm but pubring.gpg
is still around with valid data. We do not know what file contains what
we need, so just copy both.

Signed-off-by: Christian Hesse <mail@eworm.de>
Signed-off-by: Pierre Schmitz <pierre@archlinux.de>

1 files changed, 2 insertions, 1 deletions

diff --git a/makechrootpkg.in b/makechrootpkg.in
index cc02547..207a148 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -156,7 +156,8 @@ prepare_chroot() {
 	# 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
+	fi
+	if [[ -r $USER_HOME/.gnupg/pubring.gpg ]]; then
 		install -D "$USER_HOME/.gnupg/pubring.gpg" "$copydir/build/.gnupg/pubring.gpg"
 	fi