TMPDIR=$(mktemp -d);
+HOSTNAME=$(hostname);
+
if [ "$HOSTNAME" = "rietz" ] || [ "$HOSTNAME" = "busoni" ]; then
BASEDIR="/org/bugs.debian.org"
USERCONF="bugs/user_prefs";
echo $$ > "$SACONFIG/.update_spamassassin";
fi;
-function remove_pidfile(){
+remove_pidfile () {
rm "$SACONFIG/.update_spamassassin";
}
-trap remove_pidfile ERR;
+trap remove_pidfile 0;
FAILUREMESSAGE="";
-function report_failure(){
+report_failure () {
# Hrm; a previous update failed; don't report again until the file
# is removed or it's more than a day old
if [ -e "$SACONFIG/failed_update" ] &&