X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=scripts%2Fdebian%2Fbuildd-remove-keys;h=c07ff04b144bba0cba43f272a87de293168c5729;hb=4db5d5e09a9c6d827ad2dfce208e4e7368ce220c;hp=45c4b2069a791cae8d221a24705ad2000c92c539;hpb=1073f180f3446768d60fe4a03f88728183818bce;p=dak.git

diff --git a/scripts/debian/buildd-remove-keys b/scripts/debian/buildd-remove-keys
index 45c4b206..c07ff04b 100755
--- a/scripts/debian/buildd-remove-keys
+++ b/scripts/debian/buildd-remove-keys
@@ -56,7 +56,7 @@ trap cleanup ERR EXIT TERM HUP INT QUIT
 base="${base}/scripts/builddkeyrings"
 INCOMING="${base}/incoming"
 ERRORS="${base}/errors"
-ADMINS="${base}/admins"
+ADMINS="${base}/adminkeys.gpg"
 REMOVED="${base}/removed-buildd-keys.gpg"
 
 # Default options for our gpg calls
@@ -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} --keyring "${ADMINS}/${ARCH}.gpg" --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 removing key using ${file}"
         DATE=$(date -Is)