X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=update_spamassassin;h=00c540f48d05306f3b822b387d545415187c9c62;hp=59ab92e4d858f1a2f623b05993dbac6454259a7a;hb=05eda589302202d16da09d6ec493c8d09cfbd2aa;hpb=11ce2b1ce79fb3fde1e9b1a5b2388e4fcd3cac4b

diff --git a/update_spamassassin b/update_spamassassin
index 59ab92e..00c540f 100755
--- a/update_spamassassin
+++ b/update_spamassassin
@@ -75,8 +75,8 @@ if svn status |grep -q '^C'; then
 fi;
 cd - >/dev/null 2>&1
 
-if ! spamassassin -C $TMPDIR/spamassassin_config/$USERCONF --lint > $TMPDIR/sa_lint 2>&1; then
-    FAILUREMESSAGE="$(echo -e 'spamassassin -C $TMPDIR/spamassassin_config/$USERCONF --lint\nfailed with\n'| cat - $TMPDIR/sa_lint)";
+if ! spamassassin -p $TMPDIR/spamassassin_config/$USERCONF --lint > $TMPDIR/sa_lint 2>&1; then
+    FAILUREMESSAGE="$(echo -e 'spamassassin -p $TMPDIR/spamassassin_config/$USERCONF --lint\nfailed with\n'| cat - $TMPDIR/sa_lint)";
     report_failure
 fi;
 mv "$SACONFIG" "$BAKDIR/spamassassin_config_r$ORIGREV"
@@ -89,6 +89,7 @@ if [ "$HOSTNAME" == "rietz" ]; then
     touch /home/debbugs/.spamassassin/user_prefs
 elif [ "$HOSTNAME" == "murphy" ]; then
     # do nothing
+    true;
 else
     echo "Unknown hostname '$HOSTNAME'";
     exit 1;