[SVN] r738 - in /branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian: changelog cyrus-common-2.3.postrm

[debian at incase.de]

Author: sven
Date: Fri Jun 22 15:18:25 2007
New Revision: 738

URL: https://mail.incase.de/viewcvs?rev=3D738&root=3Dcyrus22&view=3Drev
Log:
Merge r694 from trunk (manually due to different package names in debconf c=
alls): postrm doesn't fail without available debconf anymore

Modified:
    branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/changelog
    branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/cyrus-common-2.3.postrm

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/changelog
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/=
debian/changelog?rev=3D738&root=3Dcyrus22&r1=3D737&r2=3D738&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/changelog (original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/changelog Fri Jun 22 15:1=
8:25 2007
@@ -35,6 +35,7 @@
   * Run autoconf to generate update configure script after above patch was
     applied to configure.in
   * Update to 2.3.8
+  * Merge postrm fix regarding debconf (doesn't always exist on removal/pu=
rge)
 =

   [ Benjamin Seidenberg ]
   * Merge in changes from previous 2.2s

Modified: branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/cyrus-common-2.3.po=
strm
URL: https://mail.incase.de/viewcvs/branches/cyrus23/cyrus-imapd-2.3-2.3.8/=
debian/cyrus-common-2.3.postrm?rev=3D738&root=3Dcyrus22&r1=3D737&r2=3D738&v=
iew=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/cyrus-common-2.3.postrm (=
original)
+++ branches/cyrus23/cyrus-imapd-2.3-2.3.8/debian/cyrus-common-2.3.postrm F=
ri Jun 22 15:18:25 2007
@@ -9,7 +9,14 @@
 set -e
 =

 # debconf hook
-. /usr/share/debconf/confmodule
+if [ -e /usr/share/debconf/confmodule ]; then
+	. /usr/share/debconf/confmodule
+	DEBCONFEXISTS=3D"true"
+	export DEBCONFEXISTS
+else
+	DEBCONFEXISTS=3D"false"
+	export DEBCONFEXISTS
+fi
 =

 # summary of how this script can be called:
 #        * <postrm> `remove'
@@ -36,24 +43,28 @@
 			rm usr/lib/cyrus/cyrus-hardwired-config.active || true
 =

 			# Should we remove our precious data?
-			db_title "Cyrus IMAPd 2.3" || true
-			db_fset cyrus-common-2.3/removespools seen false || true
-			db_input high cyrus-common-2.3/removespools || true
-			db_go || true
+			if [ "$DEBCONFEXISTS" =3D "true" ]; then
+				db_title "Cyrus IMAPd 2.3" || true
+				db_fset cyrus-common-2.3/removespools seen false || true
+				db_input high cyrus-common-2.3/removespools || true
+				db_go || true
+				db_get cyrus-common-2.3/removespools
+			else
+				RET=3D"false"
+			fi
 =

 			db_get cyrus-common-2.3/removespools
 			[ "${RET}" =3D "true" ] && {
-				for i in /var/spool/cyrus /var/lib/cyrus \
-				         /var/spool/sieve /etc/sieve ; do
-				        find "$i" -type f -exec rm -f '{}' \; || true
-				        find "$i" -type d -depth -not -name 'lost+found' -exec rmdir '=
{}' \; || true
+					 /var/spool/sieve /etc/sieve ; do
+					find "$i" -type f -exec rm -f '{}' \; || true
+					find "$i" -type d -depth -not -name 'lost+found' -exec rmdir '{}' \; =
|| true
 				done
 				# Remove database type information
 				rm -f /usr/lib/cyrus/cyrus-*.active
 			}
 =

 			update-rc.d cyrus2.3 remove >/dev/null
-        	;;
+		;;
 =

 		upgrade|failed-upgrade|disappear)
 			;;
@@ -76,3 +87,5 @@
 #DEBHELPER#
 =

 exit 0
+ =

+