From: Joerg Jaspert Date: Sat, 3 Mar 2012 17:34:18 +0000 (+0100) Subject: And also catch double-sign-edit-failure-sign-whatever files X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd80b169287a128cd9e3b833852fbf68106385b5;p=dak And also catch double-sign-edit-failure-sign-whatever files Signed-off-by: Joerg Jaspert --- diff --git a/scripts/debian/buildd-add-keys b/scripts/debian/buildd-add-keys index 61cd154c..619a514f 100755 --- a/scripts/debian/buildd-add-keys +++ b/scripts/debian/buildd-add-keys @@ -176,7 +176,17 @@ for file in ${KEYS}; do TEMPKEYDATA=$(mktemp -p "${TMPDIR}" BDKEYS.XXXXXX) - gpg ${DEFGPGOPT} --with-colons "${GPGOUTF}" > "${TEMPKEYDATA}" + # We also need to ensure this works, otherwise manually mangled files can break us here + if ! gpg ${DEFGPGOPT} --with-colons "${GPGOUTF}" > "${TEMPKEYDATA}"; then + log "For some reason we could validate the sig but failed on getting key details" + DATE=$(date -Is) + mv "${INCOMING}/${file}" "${ERRORS}/badsig.${file}.${DATE}" + mv "${GPGSTATUS}" "${ERRORS}/badsig.${file}.gpgstatus.${DATE}" + mv "${GPGLOGS}" "${ERRORS}/badsig.${file}.gpglogs.${DATE}" + rm -f "${GPGOUTF}" + rm -f "${TMPKEYDATA}" + continue + fi # Read in the TEMPKEYDATAFILE, but avoid using a subshell like a # while read line otherwise would do