From: Karolin Seeger <kseeger@samba.org>
Date: Thu, 21 Jan 2021 12:03:44 +0000 (+0100)
Subject: script/release.sh: always select the GPG key by it's ID
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ddc4f401ced98fc1d8f824ec8b0d61f271ed3de8;p=thirdparty%2Fsamba.git

script/release.sh: always select the GPG key by it's ID

Signed-off-by: Karolin Seeger <kseeger@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 715b208b513035269a6523f8543c4bf328a7c0f2)
---

diff --git a/script/release.sh b/script/release.sh
index fd7e9736416..45e9206005c 100755
--- a/script/release.sh
+++ b/script/release.sh
@@ -316,7 +316,7 @@ create_release() {
 
 	echo "Signing ${tarname} => ${tarname}.asc"
 	rm -f "${tarname}.asc"
-	gpg -u "${GPG_USER}" --detach-sign --armor ${tarname} || {
+	gpg --default-key "${GPG_KEYID}" --detach-sign --armor ${tarname} || {
 		return 1
 	}
 	test -f "${tarname}.asc" || {
@@ -362,7 +362,7 @@ patch_release() {
 	echo "Signing ${patchfile} => ${patchfile}.asc"
 	rm -f "${patchfile}.asc"
 	CLEANUP_FILES="${CLEANUP_FILES} ${patchfile}.asc"
-	gpg -u "${GPG_USER}" --detach-sign --armor ${patchfile} || {
+	gpg --default-key "${GPG_KEYID}" --detach-sign --armor ${patchfile} || {
 		return 1
 	}
 	test -f "${patchfile}.asc" || {