check the prefs, don't set the conf dir

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-listmaster/trunk/spamassassin_config@95 0b7a5b0c-1f2c-0410-bd74-c376f8064c91

diff --git a/update_spamassassin b/update_spamassassin
index 59ab92e4d858f1a2f623b05993dbac6454259a7a..f9e02d65a0e2a3499e8cca6eaaf6401ac26fb3a1 100755 (executable)
--- a/update_spamassassin
+++ b/update_spamassassin
@@ -75,8 +75,8 @@ if svn status |grep -q '^C'; then
 fi;
 cd - >/dev/null 2>&1
 
 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"
     report_failure
 fi;
 mv "$SACONFIG" "$BAKDIR/spamassassin_config_r$ORIGREV"