X-Git-Url: https://git.decadent.org.uk/gitweb/?p=dak.git;a=blobdiff_plain;f=scripts%2Fdebian%2Fbuildd-add-keys;h=b141cc86058cb5952139cee748d6415d9a3dc6f7;hp=619a514f07458d432b418700574784f4774bdf8e;hb=5f2e8ff9f4ac151cf568900629972eca34a003e5;hpb=ad8367d4ad22c161a57936d4d7e97a47dc2ac224 diff --git a/scripts/debian/buildd-add-keys b/scripts/debian/buildd-add-keys index 619a514f..b141cc86 100755 --- a/scripts/debian/buildd-add-keys +++ b/scripts/debian/buildd-add-keys @@ -274,8 +274,9 @@ for file in ${KEYS}; do # We need to check for the amount of keys ARCHKEYRING="${base}/${ARCH}/keyring.gpg" - KEYNO=$(gpg ${DEFGPGOPT} --keyring "${ARCHKEYRING}" --with-colons --list-keys "buildd_${ARCH}-${BUILDD}@buildd.debian.org" | grep -c '^pub:' || /bin/true ) + KEYNO=$(gpg ${DEFGPGOPT} --keyring "${ARCHKEYRING}" --with-colons --list-keys "buildd_${ARCH}-${BUILDD}@buildd.debian.org" 2>/dev/null | grep -c '^pub:' || /bin/true ) if [ ${KEYNO} -gt 2 ]; then + log "Too many keys for ${ARCH} buildd ${BUILDD}" DATE=$(date -Is) mv "${INCOMING}/${file}" "${ERRORS}/toomany.${file}.${DATE}" mv "${GPGSTATUS}" "${ERRORS}/toomany.${file}.gpgstatus.${DATE}"