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

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 5bb13f060158eb3118c8f3e6fbaf9a2a8942fff8
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Sun Jul 8 13:36:14 2012 +0400

    force /etc/defaults/bacula-dir ucf reregistration.
    
    On switching bacula-director from one database type to other there was
    a trouble that file already register by other package (#680051).

diff --git a/debian/additions/common-functions.dpkg b/debian/additions/common-functions.dpkg
index a24023d..32e88cd 100644
--- a/debian/additions/common-functions.dpkg
+++ b/debian/additions/common-functions.dpkg
@@ -72,6 +72,10 @@ setup_etc_default() {
         bacula-director-pgsql|bacula-director-mysql|bacula-director-sqlite3)
             SERVICE="bacula-dir"
             DAEMONUSER="bacula:bacula"
+            if ucfq -w "/etc/default/bacula-dir" \
+                |egrep -q '^[^:]*:bacula-director-(pgsql|mysql|sqlite3):'; then
+                UCFR_ARGS="-f"
+            fi
             ;;
         *)
             echo "setup_defaults: unknown package \"$1\"" >&2
@@ -83,6 +87,7 @@ setup_etc_default() {
     ARGS=""
     CONFIG="/etc/bacula/$SERVICE.conf"
     DEFAULTS="/etc/default/$SERVICE"
+    UCFR_ARGS="${UCFR_ARGS:-}"
 
 
     if [ -n "$3" ]; then
@@ -123,7 +128,7 @@ CONFIG="$CONFIG"
 _EOF
 
     ucf --debconf-ok "$tempfile" "$DEFAULTS"
-    ucfr "$PACKAGE" "$DEFAULTS"
+    ucfr $UCFR_ARGS "$PACKAGE" "$DEFAULTS"
     rm -f "$tempfile"
 }
 
diff --git a/debian/changelog b/debian/changelog
index e72cce7..6b788b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,9 @@ bacula (5.2.6+dfsg-3) unstable; urgency=high
       thanks to Matija Nalis (Closes: #556207).
   * debian/bacula-common.preinst:
     + 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, a network backup, recovery and verification program