config/debian/daily.functions

@@ -63,7 +63,7 @@ function update-buildd-admin-keyring() {
     log "Updateing buildd admin keyring"
     . ${configdir}/buildd-keyrings.conf
     cd ${scriptdir}/builddkeyrings
-    gpg --no-default-keyring --keyring /srv/keyring.debian.org/keyrings/debian-keyring.gpg --export "${buildd_admin_keys[@]}" |
-        gpg --no-default-keyring --keyring ./adminkeys.gpg.new --import
+    gpg --no-tty --no-default-keyring --keyring /srv/keyring.debian.org/keyrings/debian-keyring.gpg --export "${buildd_admin_keys[@]}" |
+        gpg --no-tty --no-default-keyring --keyring ./adminkeys.gpg.new --import
     mv adminkeys.gpg.new adminkeys.gpg
 }

scripts/debian/buildd-add-keys

@@ -135,9 +135,12 @@ for file in ${KEYS}; do
     if [ -f "${ARCHADMINS}/${ARCH}.gpg" ]; then
         KEYRINGS="${KEYRINGS} --keyring ${ARCHADMINS}/${ARCH}.gpg"
     fi
-    # So lets run gpg, status/logger into the two files, to "decrypt" the keyfile
-    if ! gpg ${DEFGPGOPT} ${KEYRINGS} --status-fd 4 --logger-fd 5 --decrypt "${INCOMING}/${file}" > "${GPGOUTF}"; then
+    set +e
+    gpg ${DEFGPGOPT} ${KEYRINGS} --status-fd 4 --logger-fd 5 --decrypt "${INCOMING}/${file}" > "${GPGOUTF}"
     ret=$?
+    set -e
+    # So lets run gpg, status/logger into the two files, to "decrypt" the keyfile
+    if [[ ${ret} -ne 0 ]]; then
         log "gpg returned with ${ret}, not adding key from file ${file}"
         DATE=$(date -Is)
         mv "${INCOMING}/${file}" "${ERRORS}/gpgerror.${file}.${DATE}"

scripts/debian/buildd-remove-keys

@@ -132,8 +132,11 @@ for file in ${KEYS}; do
     exec 5> "${GPGLOGS}"
 
     # So lets run gpg, status/logger into the two files, to "decrypt" the keyfile
-    if ! gpg ${DEFGPGOPT} --keyring "${ADMINS}" --status-fd 4 --logger-fd 5 --decrypt "${INCOMING}/${file}" > "${GPGOUTF}"; then
+    set +e
+    gpg ${DEFGPGOPT} --keyring "${ADMINS}" --status-fd 4 --logger-fd 5 --decrypt "${INCOMING}/${file}" > "${GPGOUTF}"
     ret=$?
+    set -e
+    if [[ ${ret} -ne 0 ]]; then
         log "gpg returned with ${ret}, not removing key using ${file}"
         DATE=$(date -Is)
         mv "${INCOMING}/${file}" "${ERRORS}/gpgerror.${file}.${DATE}"