Commit 4a9ecdfe authored by Christian Hesse's avatar Christian Hesse Committed by Dave Reisner
Browse files

handle gnupg 2.1.x public keyring

parent 33fda4e8

makechrootpkg.in

+5 −4
Original line number Diff line number Diff line
@@ -153,10 +153,11 @@ prepare_chroot() { 
		echo 'BUILDDIR="/build"' >> "$copydir/etc/makepkg.conf"

	fi



	# Read .makepkg.conf and .gnupg/pubring.gpg even if called via sudo

	if [[ -r "$USER_HOME/.gnupg/pubring.gpg" ]]; then

		install -D "$USER_HOME/.gnupg/pubring.gpg" \

			   "$copydir/build/.gnupg/pubring.gpg"

	# 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

		install -D "$USER_HOME/.gnupg/pubring.gpg" "$copydir/build/.gnupg/pubring.gpg"

	fi



	mkdir -p "$copydir/pkgdest"