[dak/master] ignore gpg errors
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
scripts/debian/buildd-add-keys | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/scripts/debian/buildd-add-keys b/scripts/debian/buildd-add-keys
index ddb56a4..06ff011 100755
--- a/scripts/debian/buildd-add-keys
+++ b/scripts/debian/buildd-add-keys
@@ -221,8 +221,9 @@ for file in $(ls -1 ${INCOMING}/*.key); do
# rollover works. 3 won't, they have to rm one first
# We need to check for the amount of keys
ARCHKEYRING="${base}/${ARCH}/keyring.gpg"
+ trap - ERR EXIT TERM HUP INT QUIT
- KEYNO=$(gpg ${DEFGPGOPT} --keyring "${ARCHKEYRING}" --with-colons --list-keys "buildd_${ARCH}-${BUILDD}@buildd.debian.org" | grep -c '^pub:')
+ KEYNO=$(gpg ${DEFGPGOPT} --keyring "${ARCHKEYRING}" --with-colons --list-keys "buildd_${ARCH}-${BUILDD}@buildd.debian.org" | grep -c '^pub:' || /bin/true )
if [ ${KEYNO} -gt 2 ]; then
DATE=$(date -Is)
mv "${INCOMING}/${file}" "${ERRORS}/toomany.${file}.${DATE}"
--
1.7.2.5
Reply to: