[pkg-bacula-commits] [bacula] 02/02: Really fix PostgreSQL upgrades

[Carsten Leonhardt]

This is an automated email from the git hooks/post-receive script.

leo pushed a commit to branch master
in repository bacula.

commit 963fa7f25bf8c83294ea36937531c4002023b3e1
Author: Carsten Leonhardt <leo at debian.org>
Date:   Thu Jul 14 18:16:43 2016 +0200

    Really fix PostgreSQL upgrades
    
    debian/scripts/install-dbconfig-upgrade still had special handling for
    the "optional" part of the PostgreSQL-Upgrade, but that is now handled
    by debian/additions/pgsql/database/7.4.1, introduced in commit
    c9db8737440534dd0bd06705f9a9b50cd62aaaef
---
 debian/changelog                        |  1 +
 debian/scripts/install-dbconfig-upgrade | 11 -----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6b3938d..72b9c0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 bacula (7.4.2+dfsg-2) unstable; urgency=medium
 
   * Fix MySQL database creation via dbconfig-common (Closes: #830999)
+  * Really fix PostgreSQL upgrades
 
  --
 
diff --git a/debian/scripts/install-dbconfig-upgrade b/debian/scripts/install-dbconfig-upgrade
index fab72da..752d14e 100755
--- a/debian/scripts/install-dbconfig-upgrade
+++ b/debian/scripts/install-dbconfig-upgrade
@@ -39,17 +39,6 @@ while [ $dbtarget -le $lastdbversion ]; do
 	targetfile="debian/bacula-director-"$db"/"$dbc"/bacula-director-"$db"/upgrade/"$db"/"$baculaversion;
 
 	awk -v version=$dbtarget -f $extractor $sourcefile >> $targetfile
-
-	# special handling for pgsql, there's extra code at the end of
-	# the upgrade script that we use for updates to version 15
-	# - sh compatible improvements welcome :-)
-	if [ $db = pgsql ]; then
-	    if [ $dbtarget -eq 15 ]; then
-		# the double awk invocation tries to make extra sure we get the correct instructions
-		awk '/For all versions, we need to create the Index on Media/ , /^END-OF-DATA$/' $sourcefile | awk '/set client_min_messages/, /CREATE INDEX media_storageid_idx ON Media/' >> $targetfile
-	    fi
-	fi
-
     done
 
     dbtarget=$((dbtarget + 1))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bacula/bacula.git