[pkg-bacula-commits] [bacula] 01/03: assume /usr/bin as path to sql client in baculabackupreport.in

[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 8d385df45a9042a25b7acb2b3b3848bfc251dc8b
Author: Carsten Leonhardt <leo at debian.org>
Date:   Mon Sep 11 17:58:40 2017 +0200

    assume /usr/bin as path to sql client in baculabackupreport.in
---
 .../patches/upstream-fix-baculabackupreport-defaults.patch  | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/debian/patches/upstream-fix-baculabackupreport-defaults.patch b/debian/patches/upstream-fix-baculabackupreport-defaults.patch
index 698ada2..4644719 100644
--- a/debian/patches/upstream-fix-baculabackupreport-defaults.patch
+++ b/debian/patches/upstream-fix-baculabackupreport-defaults.patch
@@ -3,7 +3,7 @@ Last update: 2017-09-04
 
 --- a/scripts/baculabackupreport.in
 +++ b/scripts/baculabackupreport.in
-@@ -44,17 +44,16 @@
+@@ -44,17 +44,17 @@
  # ----------------
  server="@hostname@"
  admin="@job_email@"
@@ -23,16 +23,17 @@ Last update: 2017-09-04
 +dbtype="@DEFAULT_DB_TYPE@"                          # Supported options are pgsql/postgresql, mysql, mariadb
 +db="@db_name@"
 +dbuser="@db_user@"
++dbindir="/usr/bin"
 +# dbpass="-p at db_password@"   # Uncomment and set db password if one is used
  
  # Formatting variables
  # --------------------
-@@ -133,17 +132,17 @@
+@@ -133,17 +133,17 @@
                  FROM Job \
                  WHERE (RealEndTime >= DATE_ADD(NOW(), INTERVAL -${hist} HOUR) OR JobStatus='R') \
                  ORDER BY ${sortfield} ${sortorder};" \
 -                | ${dbbin} -u ${dbuser} ${dbpass} ${db} \
-+                | @MYSQL_BINDIR@/mysql -u ${dbuser} ${dbpass} ${db} \
++                | ${dbbindir}/mysql -u ${dbuser} ${dbpass} ${db} \
                  | sed '/^JobId/d' )
                  ;;
  
@@ -44,16 +45,16 @@ Last update: 2017-09-04
                  WHERE (RealEndTime >= CURRENT_TIMESTAMP(2) - cast('${hist} HOUR' as INTERVAL) OR JobStatus='R') \
                  ORDER BY ${sortfield} ${sortorder};" \
 -                | ${dbbin} -U ${dbuser} ${dbpass} ${db} -0t \
-+                | @POSTGRESQL_BINDIR@/psql -U ${dbuser} ${dbpass} ${db} -0t \
++                | ${dbbindir}/psql -U ${dbuser} ${dbpass} ${db} -0t \
                  | sed -e 's/|//g' -e '/^$/d' )
                  ;;
  
-@@ -153,7 +152,7 @@
+@@ -153,7 +153,7 @@
                  FROM Job \
                  WHERE (RealEndTime >= DATE_ADD(NOW(), INTERVAL -${hist} HOUR) OR JobStatus='R') \
                  ORDER BY ${sortfield} ${sortorder};" \
 -                | ${dbbin} -u ${dbuser} -p${dbpass} ${db} -s -N )
-+                | @MYSQL_BINDIR@/mysql -u ${dbuser} -p${dbpass} ${db} -s -N )
++                | ${dbbindir}/mysql -u ${dbuser} -p${dbpass} ${db} -s -N )
                  ;;
  
          * )

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