Commit 49ad7e6d authored by Christian Hesse's avatar Christian Hesse Committed by Pierre Schmitz
Browse files

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: default avatarChristian Hesse <mail@eworm.de>
Signed-off-by: default avatarPierre Schmitz <pierre@archlinux.de>
parent 85705363

makechrootpkg.in

+2 −1
Original line number Diff line number Diff line
@@ -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