Somehow it helps to actually use the admin keyrings

[dak.git] / scripts / debian / buildd-add-keys

diff --git a/scripts/debian/buildd-add-keys b/scripts/debian/buildd-add-keys
index 1393256619550bd0fa0049f34792fe8e1b98000c..4cb56be8eef468ae902fd57842a9557b3ccf6d3b 100755 (executable)
--- a/scripts/debian/buildd-add-keys
+++ b/scripts/debian/buildd-add-keys
@@ -53,7 +53,7 @@ function cleanup() {
 }
 trap cleanup ERR EXIT TERM HUP INT QUIT
 
-base=="${base}/scripts/builddkeyrings"
+base="${base}/scripts/builddkeyrings"
 INCOMING="${base}/incoming"
 ERRORS="${base}/errors"
 ADMINS="${base}/admins"
@@ -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)