From: Dan Langille <dan@langille.org>
Date: Sat, 3 Jan 2004 22:26:34 +0000 (+0000)
Subject: Use the command line utility dropdb instead of the psql command
X-Git-Tag: Release-7.0.0~9756
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d7627843ae4f9cb8925d8198c2c3643a519d0fc4;p=bacula%2Fbacula

Use the command line utility dropdb instead of the psql command
drop database.  The latter cannot be used because we would be using
the database we are dropping.


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

diff --git a/bacula/src/cats/drop_postgresql_database.in b/bacula/src/cats/drop_postgresql_database.in
index 9ab41c52de..bb4a1499ae 100644
--- a/bacula/src/cats/drop_postgresql_database.in
+++ b/bacula/src/cats/drop_postgresql_database.in
@@ -5,9 +5,7 @@
 
 bindir=@SQL_BINDIR@
 
-if $bindir/psql $* -f - <<END-OF-DATA
-DROP DATABASE bacula;
-END-OF-DATA
+if $bindir/dropdb bacula
 then
    echo "Drop of bacula database succeeded."
 else