r1042 - in zope-debhelper/trunk (4 files)

[Fabio Tranchitella]

    Date: Thursday, November 29, 2007 @ 12:58:59
  Author: kobold
Revision: 1042

* dh_installzopeinstance: fixed a bug, the default user for the instance
  should be zope:zope. (Closes: #453180)

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

Modified: zope-debhelper/trunk/autoscripts/postinst-dzinstance
===================================================================
--- zope-debhelper/trunk/autoscripts/postinst-dzinstance	2007-11-29 12:01:26 UTC (rev 1041)
+++ zope-debhelper/trunk/autoscripts/postinst-dzinstance	2007-11-29 12:58:59 UTC (rev 1042)
@@ -87,11 +87,11 @@
         else
             # remove, what we created
             if [ "$clean_install" = yes ] && [ "$removal" != abort ]; then
-                rm -rf /var/lib/zope$ZVER/instance/$INSTANCE
+                rm -rf "/var/lib/zope$ZVER/instance/$INSTANCE"
             fi
             if [ "$clean_install" = yes ]; then
-                rm -rf /var/log/zope$ZVER/$INSTANCE
-                rm -rf /etc/zope$ZVER/$INSTANCE
+                rm -rf "/var/log/zope$ZVER/$INSTANCE"
+                rm -rf "/etc/zope$ZVER/$INSTANCE"
             fi
         fi
     fi

Modified: zope-debhelper/trunk/autoscripts/postrm-dzinstance
===================================================================
--- zope-debhelper/trunk/autoscripts/postrm-dzinstance	2007-11-29 12:01:26 UTC (rev 1041)
+++ zope-debhelper/trunk/autoscripts/postrm-dzinstance	2007-11-29 12:58:59 UTC (rev 1042)
@@ -33,9 +33,9 @@
         if [ "$DATABASE" = "ZEO" ]; then
             dzhandle -z $ZVER purge-zeoinstance $INSTANCE || true
         fi
-        rm -rf /var/lib/zope$ZVER/instance/$INSTANCE \
-               /var/log/zope$ZVER/$INSTANCE \
-               /etc/zope$ZVER/$INSTANCE
+        rm -rf "/var/lib/zope$ZVER/instance/$INSTANCE" \
+               "/var/log/zope$ZVER/$INSTANCE" \
+               "/etc/zope$ZVER/$INSTANCE"
     fi
     ;;
 

Modified: zope-debhelper/trunk/debian/changelog
===================================================================
--- zope-debhelper/trunk/debian/changelog	2007-11-29 12:01:26 UTC (rev 1041)
+++ zope-debhelper/trunk/debian/changelog	2007-11-29 12:58:59 UTC (rev 1042)
@@ -1,3 +1,10 @@
+zope-debhelper (0.3.11) unstable; urgency=low
+
+  * dh_installzopeinstance: fixed a bug, the default user for the instance
+    should be zope:zope. (Closes: #453180)
+
+ -- Fabio Tranchitella <kobold at debian.org>  Thu, 29 Nov 2007 13:55:57 +0100
+
 zope-debhelper (0.3.10) unstable; urgency=high
 
   * Fixing postinst-dzinstance to start the ZEO database on upgrade

Modified: zope-debhelper/trunk/dh_installzopeinstance
===================================================================
--- zope-debhelper/trunk/dh_installzopeinstance	2007-11-29 12:01:26 UTC (rev 1041)
+++ zope-debhelper/trunk/dh_installzopeinstance	2007-11-29 12:58:59 UTC (rev 1042)
@@ -194,7 +194,7 @@
 				$dzinstance{'Zope-Database'} = 'ZODB';
 			}
 			if (!$dzinstance{'Zope-User'}) {
-				$dzinstance{'Zope-User'} = 'zope';
+				$dzinstance{'Zope-User'} = 'zope:zope';
 			}
 
 			if (!$dh{NOSCRIPTS}) {