[Pkg-samba-maint] r3108 - branches/ctdb/lenny-backports/debian

[sathieu at alioth.debian.org]

Author: sathieu
Date: 2009-11-03 19:38:16 +0000 (Tue, 03 Nov 2009)
New Revision: 3108

Modified:
   branches/ctdb/lenny-backports/debian/changelog
   branches/ctdb/lenny-backports/debian/control
   branches/ctdb/lenny-backports/debian/ctdb.init
Log:
Backport 1.0.99-1


Modified: branches/ctdb/lenny-backports/debian/changelog
===================================================================
--- branches/ctdb/lenny-backports/debian/changelog	2009-11-01 21:07:51 UTC (rev 3107)
+++ branches/ctdb/lenny-backports/debian/changelog	2009-11-03 19:38:16 UTC (rev 3108)
@@ -1,9 +1,20 @@
-ctdb (1.0.92-1~bpo50+1) lenny-backports; urgency=low
+ctdb (1.0.99-1~bpo50+1) lenny-backports; urgency=low
 
   * Rebuild for lenny-backports.
 
- -- Mathieu Parent <sathieu at debian.org>  Wed, 07 Oct 2009 21:29:49 +0200
+ -- Mathieu Parent <sathieu at debian.org>  Tue, 03 Nov 2009 20:37:28 +0100
 
+ctdb (1.0.99-1) unstable; urgency=low
+
+  * New upstream release
+  * ctdb.init: ported 'move the logging of the warning "No reclock file used"
+    to the startup case so we only print this warning on "service ctdb start"
+    and not for "service ctdb *"' from upstream
+    (commit eb854f65f978f24583e221138eb4f9b917b89285)
+  * Remove XS-DM-Upload-Allowed, as I am now Debian developer
+
+ -- Mathieu Parent <sathieu at debian.org>  Sat, 24 Oct 2009 14:59:19 +0200
+
 ctdb (1.0.92-1) unstable; urgency=low
 
   * New upstream release, patches integrated :

Modified: branches/ctdb/lenny-backports/debian/control
===================================================================
--- branches/ctdb/lenny-backports/debian/control	2009-11-01 21:07:51 UTC (rev 3107)
+++ branches/ctdb/lenny-backports/debian/control	2009-11-03 19:38:16 UTC (rev 3108)
@@ -6,7 +6,6 @@
 Build-Depends: debhelper (>= 5), quilt (>= 0.40), libpopt-dev, libpcap-dev [hurd-i386]
 Homepage: http://ctdb.samba.org/
 Standards-Version: 3.8.3
-XS-DM-Upload-Allowed: yes
 Vcs-Svn: svn://svn.debian.org/pkg-samba/trunk/ctdb/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-samba/trunk/ctdb/
 

Modified: branches/ctdb/lenny-backports/debian/ctdb.init
===================================================================
--- branches/ctdb/lenny-backports/debian/ctdb.init	2009-11-01 21:07:51 UTC (rev 3107)
+++ branches/ctdb/lenny-backports/debian/ctdb.init	2009-11-03 19:38:16 UTC (rev 3108)
@@ -107,10 +107,6 @@
 
 set -e
 
-[ -z "$CTDB_RECOVERY_LOCK" ] && {
-    echo "No recovery lock specified. Starting CTDB without split brain prevention"
-}
-
 # check networking is up (for redhat)
 [ "$NETWORKING" = "no" ] && exit 0
 
@@ -153,6 +149,9 @@
         CTDB_OPTIONS="${CTDB_OPTIONS}${CTDB_OPTIONS:+ }${1}${sep}${val}"
     }
 
+    [ -z "$CTDB_RECOVERY_LOCK" ] && {
+        echo "No recovery lock specified. Starting CTDB without split brain prevention"
+    }
     maybe_set "--reclock"                "$CTDB_RECOVERY_LOCK"
 
     # build up CTDB_OPTIONS variable from optional parameters
@@ -270,7 +269,7 @@
 	        rc_status -v
 	    ;;
         redhat)
-	        echo
+	        [ $RETVAL -eq 0 ] && success || failure
 	        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/ctdb
 	        echo ""
 	    ;;