X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=update_spamassassin;h=46b4952357d5838ebb75e37213b89911971909d2;hp=3a15e883ca5d63070014862da8be58cd2f0b2d87;hb=c5509c855221dc1f5aa057cdb0aa7901158e8ebc;hpb=6b9048c0c7d7d2522ba9d8c338f6aabed5ec4c01

diff --git a/update_spamassassin b/update_spamassassin
index 3a15e88..46b4952 100755
--- a/update_spamassassin
+++ b/update_spamassassin
@@ -11,10 +11,10 @@ TMPDIR=$(mktemp -d);
 
 HOSTNAME=$(hostname);
 
-if [ "$HOSTNAME" = "rietz" ] || [ "$HOSTNAME" = "busoni" ]; then
+if [ "$HOSTNAME" = "buxtehude" ]; then
     BASEDIR="/org/bugs.debian.org"
     USERCONF="bugs/user_prefs";
-elif [ "$HOSTNAME" = "liszt" ]; then
+elif [ "$HOSTNAME" = "bendel" ]; then
     BASEDIR="/var/list/.etc";
     USERCONF="lists/user_prefs";
 else
@@ -94,13 +94,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 - 0
 remove_pidfile
 rm -rf "$TMPDIR"
 
-if [ "$HOSTNAME" == "rietz" ]; then
+if [ "$HOSTNAME" = "buxtehude" ]; then
     touch /home/debbugs/.spamassassin/user_prefs
-elif [ "$HOSTNAME" == "liszt" ]; then
+elif [ "$HOSTNAME" = "bendel" ]; then
     # do nothing
     true;
 else