[pkg-bacula-commits] [SCM] Bacula, a network backup, recovery and verification program branch, master, updated. debian/5.2.6+dfsg-2-19-g9b3421a

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 9b3421a5caba0f406d050d5d7cc4ff99ce97a67d
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Thu Jul 26 00:37:00 2012 +0400

    fix purging /etc/default/bacula-dir
    
    after installing bacula-director for other database type/etc/default/bacula-dir
    can be removed by purging previous package.

diff --git a/debian/bacula-director-db.postrm.in b/debian/bacula-director-db.postrm.in
index fcb3f8f..af9608e 100644
--- a/debian/bacula-director-db.postrm.in
+++ b/debian/bacula-director-db.postrm.in
@@ -22,14 +22,19 @@ case "$1" in
 	purge)
 		rm -f $CONFFILE $CONFFILE.dist
 
-		# purge /etc/default/bacula-dir
-		rm -f /etc/default/bacula-dir /etc/default/bacula-dir.ucf-old \
-			/etc/default/bacula-dir.ucf-new /etc/default/bacula-dir.ucf-dist
-		if which ucf >/dev/null; then
-			ucf --purge /etc/default/bacula-dir
-		fi
-		if which ucfr >/dev/null; then
-			ucfr --purge bacula-director-$THISDB /etc/default/bacula-dir
+		# purge /etc/default/bacula-dir if there was not installed package
+		# for other database type
+		if ! which ucfq >/dev/null || ucfq -w "/etc/default/bacula-dir" \
+			|egrep -q "^[^:]*:bacula-director-$THISDB:"; 
+		then
+			rm -f /etc/default/bacula-dir /etc/default/bacula-dir.ucf-old \
+				/etc/default/bacula-dir.ucf-new /etc/default/bacula-dir.ucf-dist
+			if which ucf >/dev/null; then
+				ucf --purge /etc/default/bacula-dir
+			fi
+			if which ucfr >/dev/null; then
+				ucfr --purge bacula-director-$THISDB /etc/default/bacula-dir
+			fi
 		fi
 	;;
 esac
diff --git a/debian/changelog b/debian/changelog
index c817c83..2742946 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,7 +28,7 @@ bacula (5.2.6+dfsg-3) unstable; urgency=high
     + add bacula into cdrom group (Closes: #520508).
   * debian/additions/common-functions.dpkg:
     + force /etc/defaults/bacula-dir reregistration in ucf when changing
-      bacula-director database type (Closes: #680051).
+      bacula-director database type, fix purging after this (Closes: #680051).
   * debian/bacula-console.postrm:
     + fix files left after bacula-console package purge (Closes: #682733).
 

-- 
Bacula, a network backup, recovery and verification program