X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=scripts%2Fdebian%2Fbuildd-remove-keys;h=7b597c044ba48b69fc8a16348b1851b39fc93ef6;hb=2f03955b56fa89c67a9d45af6543b82adb4b1f41;hp=b9b2ecfea7907160bf644cfefb58800dd9fdcdcc;hpb=554c9c0777c3444720c8d6064608cff5f89f62c0;p=dak.git diff --git a/scripts/debian/buildd-remove-keys b/scripts/debian/buildd-remove-keys index b9b2ecfe..7b597c04 100755 --- a/scripts/debian/buildd-remove-keys +++ b/scripts/debian/buildd-remove-keys @@ -43,8 +43,7 @@ function cleanup() { trap - ERR EXIT TERM HUP INT QUIT for TEMPFILE in GPGSTATUS GPGLOGS GPGOUTF TEMPKEYDATA; do - TFILE=${TEMPFILE:=$TEMPFILE} - DELF=${!TFILE:-""} + DELF=${!TEMPFILE:-""} if [ -n "${DELF}" ] && [ -f "${DELF}" ]; then rm -f "${DELF}" fi @@ -179,6 +178,8 @@ for file in ${KEYS}; do fi done + COMMENT=${COMMENT:-"The bad ${KEYSUBMITTER} hasn't supplied a comment"} + # Right, we have the keyid, know the arch, lets see if we can remove it ARCHKEYRING="${base}/${ARCH}/keyring.gpg"