[pkg-bacula-commits] [bacula] 01/04: Revert "added patch to fix update script for postgresql databases"

[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 9993d5aba455611c03616466c6839c7a92743554
Author: Carsten Leonhardt <leo at debian.org>
Date:   Sun Jun 5 10:35:00 2016 +0200

    Revert "added patch to fix update script for postgresql databases"
    
    This reverts commit 74959ea07532aea4af45edb2fba4c4b88bbc34e4.
---
 debian/changelog                             |  1 +
 debian/patches/fix-update-pgsql-script.patch | 26 --------------------------
 debian/patches/series                        |  1 -
 debian/scripts/install-dbconfig-upgrade      |  2 +-
 4 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 93797cb..7e37135 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ bacula (7.4.1~dfsg-1) unstable; urgency=medium
   * New upstream release
   * skip old check for unsafe passwords if bacula-dir.conf doesn't
     pre-exist
+  * removed patch to fix update script for postgresql databases
 
  --
 
diff --git a/debian/patches/fix-update-pgsql-script.patch b/debian/patches/fix-update-pgsql-script.patch
deleted file mode 100644
index 4046461..0000000
--- a/debian/patches/fix-update-pgsql-script.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: fix update-postgresql-tables
- upstreams version throws an error on an optional operation
-Author: Carsten Leonhardt <leo at debian.org>
-Bug: http://bugs.bacula.org/view.php?id=2227
---- a/src/cats/update_postgresql_tables.in
-+++ b/src/cats/update_postgresql_tables.in
-@@ -145,6 +145,6 @@
- # It may fail, but it's not a big problem
- psql -f - -d ${db_name} $* <<END-OF-DATA
- set client_min_messages = fatal;
--CREATE INDEX media_poolid_idx on Media (PoolId);
--CREATE INDEX media_storageid_idx ON Media (StorageId);
-+CREATE INDEX IF NOT EXISTS media_poolid_idx on Media (PoolId);
-+CREATE INDEX IF NOT EXISTS media_storageid_idx ON Media (StorageId);
- END-OF-DATA
---- a/updatedb/update_postgresql_tables.in
-+++ b/updatedb/update_postgresql_tables.in
-@@ -145,6 +145,6 @@
- # It may fail, but it's not a big problem
- psql -f - -d ${db_name} $* <<END-OF-DATA
- set client_min_messages = fatal;
--CREATE INDEX media_poolid_idx on Media (PoolId);
--CREATE INDEX media_storageid_idx ON Media (StorageId);
-+CREATE INDEX IF NOT EXISTS media_poolid_idx on Media (PoolId);
-+CREATE INDEX IF NOT EXISTS media_storageid_idx ON Media (StorageId);
- END-OF-DATA
diff --git a/debian/patches/series b/debian/patches/series
index 19b46d9..7adedca 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,4 +9,3 @@ fix-mysql-libdir.patch
 fix-scriptdir-examples-devices.patch
 fix-systemd-tmpfiles.d-location.patch
 enable-hardening-for-bat.patch
-fix-update-pgsql-script.patch
diff --git a/debian/scripts/install-dbconfig-upgrade b/debian/scripts/install-dbconfig-upgrade
index a681133..fab72da 100755
--- a/debian/scripts/install-dbconfig-upgrade
+++ b/debian/scripts/install-dbconfig-upgrade
@@ -46,7 +46,7 @@ while [ $dbtarget -le $lastdbversion ]; do
 	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 (IF NOT EXISTS )?media_storageid_idx ON Media/' >> $targetfile
+		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
 

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