Fix bug 399 -- make_catalog_backup does not work for sqlite3

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

diff --git a/bacula/kes-1.37 b/bacula/kes-1.37
index 8b8ea4dabf2260513251d1da469019e83c8d1a26..98f08437253c78a6353433b0132ff80a6a7fc944 100644 (file)
--- a/bacula/kes-1.37
+++ b/bacula/kes-1.37
@@ -5,6 +5,7 @@ General:
 
 Changes to 1.37.36:
 18Aug05
+- Fix bug 399 -- make_catalog_backup does not work for sqlite3
 - Implement unloading a volume in a different drive if it
   is needed in the current drive.
 - Implement search for unused autochanger drive.

diff --git a/bacula/src/cats/make_catalog_backup.in b/bacula/src/cats/make_catalog_backup.in
index c260a0ca158fcba3947c8166deb3cdcdcd26d327..dcb05b7165cbe08eb5104aa229b100d77294e4a4 100755 (executable)
--- a/bacula/src/cats/make_catalog_backup.in
+++ b/bacula/src/cats/make_catalog_backup.in
@@ -10,21 +10,25 @@
 #
 #
 cd @working_dir@
-rm -f $1.sql
+rm -f bacula.sql
 if test xsqlite = x@DB_NAME@ ; then
   echo ".dump" | @SQL_BINDIR@/sqlite $1.db >$1.sql
 else
   if test xmysql = x@DB_NAME@ ; then
     @SQL_BINDIR@/mysqldump -u $2 -f --opt $1 >$1.sql
-  else
-    @SQL_BINDIR@/pg_dump -U $2 $1 >$1.sql
+  else                       
+    if test xpostgresql = x@DB_NAME@ ; then
+      @SQL_BINDIR@/pg_dump -U $2 $1 >$1.sql
+    else
+      echo ".dump" | @SQL_BINDIR@/sqlite3 $1.db >$1.sql
+    fi
   fi
 fi
 #
 #  To read back a MySQL database use: 
 #     cd @working_dir@
 #     rm -f @SQL_BINDIR@/../var/bacula/*
-#     mysql bacula <bacula.sql
+#     mysql <bacula.sql
 #
 #  To read back a SQLite database use:
 #     cd @working_dir@