[Pkg-dspam-commits] [pkg-dspam-commits] r152 - trunk/debian

[Kurt B. Kaiser]

Author: kbk-guest
Date: Thu Feb 28 21:40:31 2008
New Revision: 152

Log:
cron: use defaults-file.  Closes: #467437


Modified:
   trunk/debian/changelog
   trunk/debian/libdspam7-drv-mysql.cron.daily

Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog	(original)
+++ trunk/debian/changelog	Thu Feb 28 21:40:31 2008
@@ -5,8 +5,9 @@
   * Cleanup manpages: remove 'n3' typos; fix unescaped minus signs.
   * Remove obsolete Suggests: from dspam-webfrontend, make it Priority: extra.
   * ldap_init result was implicitly converted to pointer. (Closes: #463362)
+  * libdspam7-drv-mysql: cron should use defaults-file. (Closes: #467437)
 
- -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Mon, 25 Feb 2008 13:34:36 -0500
+ -- Debian DSPAM Maintainers <pkg-dspam-misc at lists.alioth.debian.org>  Thu, 28 Feb 2008 15:47:08 -0500
 
 dspam (3.6.8-6) unstable; urgency=low
 

Modified: trunk/debian/libdspam7-drv-mysql.cron.daily
==============================================================================
--- trunk/debian/libdspam7-drv-mysql.cron.daily	(original)
+++ trunk/debian/libdspam7-drv-mysql.cron.daily	Thu Feb 28 21:40:31 2008
@@ -23,14 +23,14 @@
     # If host is empty or starting with a / assume it's localhost.
     if [ -z "$MYSQL_HOST" ] || \
        [ ` echo "${MYSQL_HOST}" | cut -c1 ` = "/" ]; then
-        /usr/bin/mysql --defaults-extra-file=$MYSQLCONF_PASSWD \
+        /usr/bin/mysql --defaults-file=$MYSQLCONF_PASSWD \
 	               --user=$MYSQL_USER $MYSQL_DB < $PURGE
     else
         if echo "$MYSQL_HOST" | grep "^/" > /dev/null 2>&1 ; then
             # Assume it is a socket:
-            /usr/bin/mysql --defaults-extra-file=$MYSQLCONF_PASSWD --socket=$MYSQL_HOST --user=$MYSQL_USER < $PURGE
+            /usr/bin/mysql --defaults-file=$MYSQLCONF_PASSWD --socket=$MYSQL_HOST --user=$MYSQL_USER < $PURGE
         else
-            /usr/bin/mysql --defaults-extra-file=$MYSQLCONF_PASSWD --host=$MYSQL_HOST --user=$MYSQL_USER < $PURGE
+            /usr/bin/mysql --defaults-file=$MYSQLCONF_PASSWD --host=$MYSQL_HOST --user=$MYSQL_USER < $PURGE
         fi
     fi