[dak/master] just one admin keyring
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
scripts/debian/buildd-add-keys | 4 ++--
scripts/debian/buildd-remove-keys | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/debian/buildd-add-keys b/scripts/debian/buildd-add-keys
index 4cb56be..ddb56a4 100755
--- a/scripts/debian/buildd-add-keys
+++ b/scripts/debian/buildd-add-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"
# 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} --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 adding key from file ${file}"
DATE=$(date -Is)
diff --git a/scripts/debian/buildd-remove-keys b/scripts/debian/buildd-remove-keys
index 45c4b20..c07ff04 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)
--
1.7.2.5
Reply to: