From: intrigeri <intrigeri@758a04ac-41e6-0310-8a23-8373a73cc35d>
Date: Sun, 14 Aug 2005 22:49:43 +0000 (+0000)
Subject: Fixed a critical bug in pgsql handler vservers support.
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=6a829acb8b06e91f9aa9583a1ef057f30c3a0930;p=matthijs%2Fupstream%2Fbackupninja.git

Fixed a critical bug in pgsql handler vservers support.

git-svn-id: http://code.autistici.org/svn/backupninja/trunk@167 758a04ac-41e6-0310-8a23-8373a73cc35d
---

diff --git a/handlers/pgsql b/handlers/pgsql
index 3f7d0b9..11a5cfe 100644
--- a/handlers/pgsql
+++ b/handlers/pgsql
@@ -69,14 +69,14 @@ chmod 700 $vroot$backupdir
 # if $databases = all, use pg_dumpall
 if [ "$databases" == "all" ]; then
     if [ $usevserver ]; then
-	execstr="$VSERVER $vsname exec su - postgres -c $PGSQLDUMPALL > $vroot$backupdir/${vsname}.sql"
+	execstr="$VSERVER $vsname exec su - postgres -c $PGSQLDUMPALL > $backupdir/${vsname}.sql"
     else
 	execstr="su - postgres -c $PGSQLDUMPALL > $backupdir/${localhost}-all.sql"
     fi
     debug "$execstr"
     if [ ! $test ]; then
-	output=`$execstr 2>&1`
-	code=$?
+       output=`$execstr 2>&1`
+       code=$?
 	if [ "$code" == "0" ]; then
 	    debug $output
 	    info "Successfully finished dump of pgsql cluster"
@@ -91,7 +91,7 @@ else
     for db in $databases; do
 	if [ $usevserver ]
 	    then
-	    execstr="$VSERVER $vsname exec su - postgres -c $PGSQLDUMP $db > $vroot$backupdir/${db}.sql"
+	    execstr="$VSERVER $vsname exec su - postgres -c $PGSQLDUMP $db > $backupdir/${db}.sql"
 	else
 	    execstr="su - postgres -c $PGSQLDUMP $db > $backupdir/${db}.sql"
 	fi