From: Scott Barninger <scott@barninger.com>
Date: Sat, 9 Dec 2006 15:33:00 +0000 (+0000)
Subject: Update patch to match kes change in environment variable.
X-Git-Tag: Release-2.0.0~137
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=80e71d1ca8d16cd33592c6cc10f6460601204f44;p=bacula%2Fbacula

Update patch to match kes change in environment variable.


git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3780 91ce42f0-d328-0410-95d8-f526ca767f89
---

diff --git a/bacula/src/cats/make_catalog_backup.in.patch b/bacula/src/cats/make_catalog_backup.in.patch
index ae4e765b47..2706746ca3 100644
--- a/bacula/src/cats/make_catalog_backup.in.patch
+++ b/bacula/src/cats/make_catalog_backup.in.patch
@@ -1,29 +1,20 @@
---- make_catalog_backup.in	2006-08-05 10:05:11.000000000 -0400
-+++ make_catalog_backup.in.fixed	2006-08-05 10:11:53.000000000 -0400
-@@ -14,7 +14,7 @@
+--- make_catalog_backup.in	2006-12-09 10:17:05.000000000 -0500
++++ make_catalog_backup.in.fixed	2006-12-09 10:24:40.000000000 -0500
+@@ -16,7 +16,7 @@
  cd @working_dir@
  rm -f bacula.sql
  if test xsqlite = x@DB_NAME@ ; then
--  echo ".dump" | @SQL_BINDIR@/sqlite $1.db >$1.sql
+-  echo ".dump" | ${BINDIR}/sqlite $1.db >$1.sql
 +  echo ".dump" | /usr/lib/bacula/sqlite/sqlite $1.db >$1.sql
  else
    if test xmysql = x@DB_NAME@ ; then
      if test $# -gt 2; then
-@@ -31,7 +31,7 @@
+@@ -33,7 +33,7 @@
        fi
-       exec @SQL_BINDIR@/pg_dump -U $2 $1 >$1.sql
+       exec ${BINDIR}/pg_dump -c -U $2 $1 >$1.sql
      else
--      echo ".dump" | @SQL_BINDIR@/sqlite3 $1.db >$1.sql
+-      echo ".dump" | ${BINDIR}/sqlite3 $1.db >$1.sql
 +      echo ".dump" | /usr/lib/bacula/sqlite/sqlite3 $1.db >$1.sql
      fi
    fi
  fi
-@@ -44,7 +44,7 @@
- #  To read back a SQLite database use:
- #     cd @working_dir@
- #     rm -f bacula.db
--#     sqlite bacula.db <bacula.sql
-+#     /usr/lib/bacula/sqlite/sqlite bacula.db <bacula.sql
- #
- #  To read back a PostgreSQL database use:
- #     cd @working_dir@