[pkg-bacula-commits] [bacula] 01/01: Another fix to upstream-fix-sqlite-update.patch.

[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 61d284b02362449bd69391c918301a1552778be2
Author: Carsten Leonhardt <leo at debian.org>
Date:   Thu Aug 31 17:41:22 2017 +0200

    Another fix to upstream-fix-sqlite-update.patch.
    
    We would have called psql instead of sqlite3 for the last update. That
    didn't affect dbconfig-common users, only people using the script
    manually.
    
    Thanks to Martin on upstream's bug tracker for pointing it out.
---
 debian/changelog                                | 2 ++
 debian/patches/upstream-fix-sqlite-update.patch | 8 ++++++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c1b7096..4e94746 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ bacula (9.0.3+dfsg-2) unstable; urgency=low
   * Fixed default config for bacula-sd so it listens only on localhost
   * Added notice about discontinued sqlite3 support also to the package
     description of bacula-common-sqlite3
+  * Another fix to upstream-fix-sqlite-update.patch, thanks to Martin on
+    upstream's bug tracker for pointing it out.
 
  --
 
diff --git a/debian/patches/upstream-fix-sqlite-update.patch b/debian/patches/upstream-fix-sqlite-update.patch
index 5066200..0ad4bdb 100644
--- a/debian/patches/upstream-fix-sqlite-update.patch
+++ b/debian/patches/upstream-fix-sqlite-update.patch
@@ -4,7 +4,7 @@ Bug: http://bugs.bacula.org/view.php?id=2306
 Last-Update: 2017-08-25
 --- a/src/cats/update_sqlite3_tables.in
 +++ b/src/cats/update_sqlite3_tables.in
-@@ -156,7 +156,12 @@
+@@ -156,10 +156,15 @@
  CREATE INDEX jobtdate_idx on JobHisto (JobTDate);
  
  UPDATE Version SET VersionId=15;
@@ -16,7 +16,11 @@ Last-Update: 2017-08-25
 +fi
  
  if [ "$DBVERSION" -eq 15 ] ; then
-     if psql -f - -d ${db_name} $* <<END-OF-DATA
+-    if psql -f - -d ${db_name} $* <<END-OF-DATA
++    sqlite3 $* ${db_name}.db  <<END-OF-DATA
+ begin;
+ CREATE TABLE basefiles_temp (
+    BaseId BIGINT,
 @@ -178,10 +183,65 @@
  DROP TABLE BaseFiles;
  ALTER TABLE basefiles_temp RENAME TO BaseFiles;

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