Somehow it helps to actually use the admin keyrings

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/scripts/debian/buildd-add-keys b/scripts/debian/buildd-add-keys
index e939617d8aee942b4d075de96e136bbdd2d13348..4cb56be8eef468ae902fd57842a9557b3ccf6d3b 100755 (executable)
--- a/scripts/debian/buildd-add-keys
+++ b/scripts/debian/buildd-add-keys
@@ -121,7 +121,7 @@ for file in $(ls -1 ${INCOMING}/*.key); do
     exec 5> "${GPGLOGS}"
 
     # So lets run gpg, status/logger into the two files, to "decrypt" the keyfile
-    if ! gpg ${DEFGPGOPT} --status-fd 4 --logger-fd 5 --decrypt "${INCOMING}/${file}" > "${GPGOUTF}"; then
+    if ! gpg ${DEFGPGOPT} --keyring "${ADMINS}/${ARCH}.gpg" --status-fd 4 --logger-fd 5 --decrypt "${INCOMING}/${file}" > "${GPGOUTF}"; then
         ret=$?
         log "gpg returned with ${ret}, not adding key from file ${file}"
         DATE=$(date -Is)

diff --git a/scripts/debian/buildd-remove-keys b/scripts/debian/buildd-remove-keys
index 6b65b8012e420a11a5fc4c4833f98ab6e26782f3..45c4b2069a791cae8d221a24705ad2000c92c539 100755 (executable)
--- a/scripts/debian/buildd-remove-keys
+++ b/scripts/debian/buildd-remove-keys
@@ -122,7 +122,7 @@ for file in $(ls -1 ${INCOMING}/*.del ); do
     exec 5> "${GPGLOGS}"
 
     # So lets run gpg, status/logger into the two files, to "decrypt" the keyfile
-    if ! gpg ${DEFGPGOPT} --status-fd 4 --logger-fd 5 --decrypt "${INCOMING}/${file}" > "${GPGOUTF}"; then
+    if ! gpg ${DEFGPGOPT} --keyring "${ADMINS}/${ARCH}.gpg" --status-fd 4 --logger-fd 5 --decrypt "${INCOMING}/${file}" > "${GPGOUTF}"; then
         ret=$?
         log "gpg returned with ${ret}, not removing key using ${file}"
         DATE=$(date -Is)