r580 - in zope-debhelper/trunk: autoscripts debian

[Fabio Tranchitella]

Author: kobold
Date: 2007-01-18 10:43:16 +0100 (Thu, 18 Jan 2007)
New Revision: 580

Modified:
   zope-debhelper/trunk/autoscripts/config-dzinstance
   zope-debhelper/trunk/autoscripts/postrm-dzinstance
   zope-debhelper/trunk/debian/changelog
Log:
Preparing the new debian release.


Modified: zope-debhelper/trunk/autoscripts/config-dzinstance
===================================================================
--- zope-debhelper/trunk/autoscripts/config-dzinstance	2007-01-18 08:59:23 UTC (rev 579)
+++ zope-debhelper/trunk/autoscripts/config-dzinstance	2007-01-18 09:43:16 UTC (rev 580)
@@ -4,7 +4,8 @@
 PORT=#DZ-PORT#
 
 # if we do not have debconf, we just skip this
-. /usr/share/debconf/confmodule || exit 0
+test -f /usr/share/debconf/confmodule || exit 0
+. /usr/share/debconf/confmodule
 
 db_capb backup
 

Modified: zope-debhelper/trunk/autoscripts/postrm-dzinstance
===================================================================
--- zope-debhelper/trunk/autoscripts/postrm-dzinstance	2007-01-18 08:59:23 UTC (rev 579)
+++ zope-debhelper/trunk/autoscripts/postrm-dzinstance	2007-01-18 09:43:16 UTC (rev 580)
@@ -2,7 +2,9 @@
 INSTANCE=#DZ-INSTANCE#
 ZVER=#DZ-ZVER#
 
-. /usr/share/debconf/confmodule || exit 0
+if [ -e /usr/share/debconf/confmodule ]; then
+    . /usr/share/debconf/confmodule
+fi
 
 [ -n "$(echo $INSTANCE)" ] || exit 1
 
@@ -19,7 +21,7 @@
     ;;
 
   purge)
-    db_get $PKG/keep-data-on-purge || true
+    db_get $PKG/keep-data-on-purge 2>/dev/null || true
     if [ "$RET" = yes ]; then
 	    echo >&2 "$PKG is configured to keep the data file on purge"
     else

Modified: zope-debhelper/trunk/debian/changelog
===================================================================
--- zope-debhelper/trunk/debian/changelog	2007-01-18 08:59:23 UTC (rev 579)
+++ zope-debhelper/trunk/debian/changelog	2007-01-18 09:43:16 UTC (rev 580)
@@ -1,3 +1,12 @@
+zope-debhelper (0.3.6) unstable; urgency=medium
+
+  * Modified {config,postrm}-dzinstance autoscripts to degrade silently if
+    debconf is not available. This is very important for the postrm script, as
+    it could be called to purge the package without debconf installed on the
+    system. Thanks to Lucas Nussbaum for reporting this problem.
+
+ -- Fabio Tranchitella <kobold at debian.org>  Thu, 18 Jan 2007 10:40:46 +0100
+
 zope-debhelper (0.3.5) unstable; urgency=medium
 
   * autoscripts/postinst-dzinstance: if we are upgrading an instance which