X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=scripts%2Fdebian%2Fbuildd-remove-keys;h=c07ff04b144bba0cba43f272a87de293168c5729;hb=5ef4bd176b8e8b9ac2bf66d09db0dfe12281177a;hp=6b65b8012e420a11a5fc4c4833f98ab6e26782f3;hpb=eda313aaa2b5e232934b9a2d3e3106a3ca8b67cd;p=dak.git diff --git a/scripts/debian/buildd-remove-keys b/scripts/debian/buildd-remove-keys index 6b65b801..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} --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)