X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=scripts%2Fdebian%2Fbuildd-add-keys;h=ddb56a42d6c446b97c4bde3192123e5d787e3621;hb=8c7bc01acbef00bf9289afe9e004fb0ea00b0e63;hp=1393256619550bd0fa0049f34792fe8e1b98000c;hpb=339fd0ea3582d0e414ff410929be45cb82ada017;p=dak.git

diff --git a/scripts/debian/buildd-add-keys b/scripts/debian/buildd-add-keys
index 13932566..ddb56a42 100755
--- a/scripts/debian/buildd-add-keys
+++ b/scripts/debian/buildd-add-keys
@@ -53,10 +53,10 @@ 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"
+ADMINS="${base}/adminkeys.gpg"
 
 # Default options for our gpg calls
 DEFGPGOPT="--no-default-keyring --batch --no-tty --no-options --exit-on-status-write-error --no-greeting"
@@ -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}" --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)