X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=update_spamassassin;h=b5641365f21023ba73d728debfd7e00731e9c632;hp=2610c9ede227861876f383d0c11f5e8796541084;hb=07723eafc59b1bf8fa565e2e8af4b810f16c549d;hpb=932f404dae7938a1b141ec4e0462574df939b3ee

diff --git a/update_spamassassin b/update_spamassassin
index 2610c9e..b564136 100755
--- a/update_spamassassin
+++ b/update_spamassassin
@@ -12,7 +12,7 @@ TMPDIR=$(mktemp -d);
 if [ "$HOSTNAME" == "rietz" ]; then
     BASEDIR="/org/bugs.debian.org"
     USERCONF="bugs/user_prefs";
-elif [ "$HOSTNAME" == "murphy" ]; then
+elif [ "$HOSTNAME" == "liszt" ]; then
     BASEDIR="/var/list/.etc";
     USERCONF="lists/user_prefs";
 else
@@ -81,13 +81,13 @@ if ! spamassassin -p $TMPDIR/spamassassin_config/$USERCONF --lint > $TMPDIR/sa_l
 fi;
 mv "$SACONFIG" "$BAKDIR/spamassassin_config_r$ORIGREV"
 mv "$TMPDIR/spamassassin_config" "$SACONFIG"
-trap ERR
+trap - ERR
 remove_pidfile
 rm -rf "$TMPDIR"
 
 if [ "$HOSTNAME" == "rietz" ]; then
     touch /home/debbugs/.spamassassin/user_prefs
-elif [ "$HOSTNAME" == "murphy" ]; then
+elif [ "$HOSTNAME" == "liszt" ]; then
     # do nothing
     true;
 else