From 49ad7e6dbe5be1d7eac9108073a2a09c81dc2aa2 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Fri, 6 Mar 2015 08:37:25 +0100 Subject: 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 Signed-off-by: Pierre Schmitz --- makechrootpkg.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3-70-g09d2