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

[Alexander Golovko]

The following commit has been merged in the master branch:
commit 94740d85b9082d25906f9e1c9b45ae528f8b9403
Author: Alexander Golovko <alexandro at ankalagon.ru>
Date:   Sat Oct 6 19:49:51 2012 +0400

    fix

diff --git a/debian/additions/common-functions.dpkg b/debian/additions/common-functions.dpkg
index e074421..b3e3d8b 100644
--- a/debian/additions/common-functions.dpkg
+++ b/debian/additions/common-functions.dpkg
@@ -84,10 +84,10 @@ config_from_other_dbtype() {
   PACKAGE="$1"
   CONFIG="$2"
 
-  base_package_name=$(echo "$PACKAGE" |sed -e 's/-(mysql|pgsql|sqlite3)$//')
+  base_package_name=$(echo "$PACKAGE" |sed -Ee 's/-(mysql|pgsql|sqlite3)$//')
   regex="^$CONFIG:$base_package_name-(mysql|pgsql|sqlite3):"
 
-  ucfq -w "$CONFIG" |grep -q "$regex"
+  ucfq -w "$CONFIG" |egrep -q "$regex"
 }
 
 
@@ -114,8 +114,8 @@ install_config() {
   tempfile=`tempfile`
 
 
-  dpkg_conffile_md5sum=$(dpkg-query -W -f='${Conffiles}' $PACKAGE | \
-    sed -n -e "\' $CONFIG ' { s/ obsolete$//; s/.* //; p }")")"
+  dpkg_conffile_md5sum="$(dpkg-query -W -f='${Conffiles}' \"$PACKAGE\" \
+    2>/dev/null |sed -ne "\' $CONFIG ' { s/ obsolete$//; s/.* //; p }")"
 
   if [ -n "$dpkg_conffile_md5sum" ]; then
     echo "$dpkg_conffile_md5sum default" >"$tempfile.md5sum"
diff --git a/debian/bacula-director-mysql.postinst b/debian/bacula-director-mysql.postinst
index 9e5626f..f3fab5c 100644
--- a/debian/bacula-director-mysql.postinst
+++ b/debian/bacula-director-mysql.postinst
@@ -67,7 +67,7 @@ configure)
 		$DEFCONFIG/bacula-dir.conf > $TARGET
 
 
-  DBNAME="$dbc_name"
+  DBNAME="$dbc_dbname"
   SUBST_VARIABLES=DBNAME
   install_config \
     bacula-director-mysql \
diff --git a/debian/bacula-director-pgsql.postinst b/debian/bacula-director-pgsql.postinst
index be44106..05b453b 100644
--- a/debian/bacula-director-pgsql.postinst
+++ b/debian/bacula-director-pgsql.postinst
@@ -76,7 +76,7 @@ configure)
         fi
 
 
-  DBNAME="$dbc_name"
+  DBNAME="$dbc_dbname"
   SUBST_VARIABLES=DBNAME
   install_config \
     bacula-director-pgsql \
diff --git a/debian/bacula-director-sqlite3.postinst b/debian/bacula-director-sqlite3.postinst
index cbfd28b..87de84d 100644
--- a/debian/bacula-director-sqlite3.postinst
+++ b/debian/bacula-director-sqlite3.postinst
@@ -71,7 +71,7 @@ configure)
 			$DEFCONFIG/bacula-dir.conf > $TARGET
  
 
-  DBNAME="$dbc_name"
+  DBNAME="$BACULADBNAME"
   SUBST_VARIABLES=DBNAME
   install_config \
     bacula-director-sqlite3 \

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