[Amavisd-new-commits] [SCM] Debian packaging for amavisd-new branch, master, updated. debian/1%2.6.4-4-23-g9d72d38

[Alexander Wirt]

The following commit has been merged in the master branch:
commit 9d72d38962c6f19cf6e3b325ea1393c546088687
Author: Alexander Wirt <formorer at debian.org>
Date:   Sun Dec 18 16:50:27 2011 +0100

    Check if bayes is disabled
    
    Closes: (#635861)

diff --git a/debian/amavisd-new-cronjob b/debian/amavisd-new-cronjob
index 6df0c39..c1c7b98 100755
--- a/debian/amavisd-new-cronjob
+++ b/debian/amavisd-new-cronjob
@@ -27,12 +27,19 @@ do_amavis_cmd() {
 	fi
 }
 
+if ! /bin/su -s /bin/sh - "${SUUSER}" -c  'perl -MMail::SpamAssassin -e "my \$spamtest = Mail::SpamAssassin->new(); \$spamtest->compile_now (); \$spamtest->{conf}->{use_bayes} ? exit 0 : exit 1"'
+then
+	#bayes is disabled - just exit
+	exit
+fi
+
+echo $?
 case $1 in
 	sa-sync)
-        do_amavis_cmd "/usr/bin/sa-learn --sync" >/dev/null
+		do_amavis_cmd "/usr/bin/sa-learn --sync"
 		;;
 	sa-clean)
-        do_amavis_cmd "/usr/bin/sa-learn --sync --force-expire" >/dev/null
+		do_amavis_cmd "/usr/bin/sa-learn --sync --force-expire"
 		;;
 	*)
 		echo "$0: unknown cron routine $1" >&2

-- 
Debian packaging for amavisd-new