r906 - in /zope-debhelper/trunk: autoscripts/postinst-dzinstance debian/changelog

[bzed-guest at users.alioth.debian.org]

Author: bzed-guest
Date: Wed Jun 20 21:28:57 2007
New Revision: 906

URL: http://svn.debian.org/wsvn/pkg-zope/?sc=1&rev=906
Log:
  * fixing postinst-dzinstance to start the ZEO database on upgrade
      if it was configured by dzinstance.


Modified:
    zope-debhelper/trunk/autoscripts/postinst-dzinstance
    zope-debhelper/trunk/debian/changelog

Modified: zope-debhelper/trunk/autoscripts/postinst-dzinstance
URL: http://svn.debian.org/wsvn/pkg-zope/zope-debhelper/trunk/autoscripts/postinst-dzinstance?rev=906&op=diff
==============================================================================
--- zope-debhelper/trunk/autoscripts/postinst-dzinstance (original)
+++ zope-debhelper/trunk/autoscripts/postinst-dzinstance Wed Jun 20 21:28:57 2007
@@ -20,10 +20,21 @@
         # instance already exists
         echo "Zope$ZVER instance '$INSTANCE' already exists".
         add_products
-        if ! dzhandle -z $ZVER zopectl $INSTANCE start; then
-            echo "Could not start zope instance $INSTANCE. Please check"
-            echo "for errors running the instance by hand:"
-            echo "  /var/lib/zope$ZVER/instance/$INSTANCE/runzope"
+	if [ "$DATABASE" = "ZEO" ]; then
+	    if ! dzhandle -z $ZVER zeoctl $INSTANCE start; then
+	        echo "Could not start the zeo database which was"
+		echo "configured for the zope instance. Please"
+		echo "check for errors by running zeo by hand"
+		echo "and start the zope instance afterwards."
+		ZEOFAILURE="yes"
+	    fi
+	fi
+	if [ -z "$ZEOFAILURE" ]; then
+            if ! dzhandle -z $ZVER zopectl $INSTANCE start; then
+                echo "Could not start zope instance $INSTANCE. Please check"
+                echo "for errors running the instance by hand:"
+                echo "  /var/lib/zope$ZVER/instance/$INSTANCE/runzope"
+	    fi
         fi
     else
         if [ -d /var/lib/zope$ZVER/instance/$INSTANCE ] && \

Modified: zope-debhelper/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zope/zope-debhelper/trunk/debian/changelog?rev=906&op=diff
==============================================================================
--- zope-debhelper/trunk/debian/changelog (original)
+++ zope-debhelper/trunk/debian/changelog Wed Jun 20 21:28:57 2007
@@ -1,3 +1,10 @@
+zope-debhelper (0.3.10) UNRELEASED; urgency=low
+
+  * fixing postinst-dzinstance to start the ZEO database on upgrade
+    if it was configured by dzinstance.
+
+ -- Bernd Zeimetz <bernd at bzed.de>  Wed, 20 Jun 2007 22:28:27 +0100
+
 zope-debhelper (0.3.9) experimental; urgency=low
 
   * dh_installzopeinstance: added a new field, Zope-User.