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>
This commit is contained in:
parent
85705363cd
commit
49ad7e6dbe
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue