From: Joerg Jaspert <joerg@debian.org>
Date: Fri, 25 Mar 2011 15:06:03 +0000 (+0100)
Subject: Somehow it helps to actually use the admin keyrings
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=1073f180f3446768d60fe4a03f88728183818bce;p=dak.git

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 e939617d..4cb56be8 100755
--- 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 6b65b801..45c4b206 100755
--- 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)