packages: spamassassin/spamassassin-spamd.init - if spamassassin database i...

[pawelz]

Author: pawelz                       Date: Sat Mar 27 20:04:09 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- if spamassassin database is not installed, spamd dies with error message
  that is not very helpful. It may confuse users. This commit adds check for
  SA database. It test fails init script won't try to start SA, but it'll
  display error message with information how to install SA satabase.

---- Files affected:
packages/spamassassin:
   spamassassin-spamd.init (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/spamassassin/spamassassin-spamd.init
diff -u packages/spamassassin/spamassassin-spamd.init:1.8 packages/spamassassin/spamassassin-spamd.init:1.9
--- packages/spamassassin/spamassassin-spamd.init:1.8	Wed Jan  6 09:30:25 2010
+++ packages/spamassassin/spamassassin-spamd.init	Sat Mar 27 21:04:02 2010
@@ -35,6 +35,12 @@
 		return
 	fi
 
+	# Check if database is installed.
+	if [ $(find /var/lib/spamassassin/ -name '*.cf' | wc -l) -gt 0 ]; then
+		show 'Spamassassin database not found. Run sa-update first.' && fail
+		return 1
+	fi
+
 	msg_starting "SpamAssassin"
 	daemon /usr/bin/spamd $SPAMD_OPTS
 	RETVAL=$?
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/spamassassin/spamassassin-spamd.init?r1=1.8&r2=1.9&f=u