]> git.decadent.org.uk Git - dak.git/commitdiff
ignore gpg errors
authorJoerg Jaspert <joerg@debian.org>
Fri, 25 Mar 2011 19:29:30 +0000 (20:29 +0100)
committerJoerg Jaspert <joerg@debian.org>
Fri, 25 Mar 2011 19:29:30 +0000 (20:29 +0100)
Signed-off-by: Joerg Jaspert <joerg@debian.org>
scripts/debian/buildd-add-keys

index ddb56a42d6c446b97c4bde3192123e5d787e3621..06ff011d1d9ce11e17e1723462df24b705479378 100755 (executable)
@@ -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}"