]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
script/release.sh: always select the GPG key by it's ID
authorKarolin Seeger <kseeger@samba.org>
Thu, 21 Jan 2021 12:03:44 +0000 (13:03 +0100)
committerKarolin Seeger <kseeger@samba.org>
Fri, 22 Jan 2021 14:09:07 +0000 (14:09 +0000)
Signed-off-by: Karolin Seeger <kseeger@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 715b208b513035269a6523f8543c4bf328a7c0f2)

Autobuild-User(v4-12-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-12-test): Fri Jan 22 14:09:07 UTC 2021 on sn-devel-184

script/release.sh

index fd7e973641654caab267823a572f534dc8832c7a..45e9206005c0846f201d35e111d507f44a2f8c33 100755 (executable)
@@ -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" || {