From 4e83361054205c56fc42ea812b6dd10c0509ddd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ramon=20Buld=C3=B3?= Date: Thu, 14 May 2015 11:10:38 +0200 Subject: [PATCH] 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. https://projects.archlinux.org/devtools.git/commit/?id=49ad7e6dbe5be1d7eac9108073a2a09c81dc2aa2 --- bin/mkchrootpkg.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/mkchrootpkg.in b/bin/mkchrootpkg.in index f1acb47..85972eb 100644 --- a/bin/mkchrootpkg.in +++ b/bin/mkchrootpkg.in @@ -195,7 +195,8 @@ prepare_chroot() { # fi 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