X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=blobdiff_plain;f=handlers%2Fsvn;h=377d71c6de57533af0bc81f259fab62d56930f05;hp=6ac54029547665829ba01b09ccbd47a19e18d784;hb=be75e4e6c536882c14db9a41c61585e7a9c045f6;hpb=cf1817d075b934aeab77d7bf10da3bf886b034ae

diff --git a/handlers/svn b/handlers/svn
index 6ac5402..377d71c 100644
--- a/handlers/svn
+++ b/handlers/svn
@@ -1,3 +1,4 @@
+# -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*-
 #
 # this handler will backup subversion repostitories.
 #
@@ -5,34 +6,33 @@
 getconf src /var/lib/svn
 getconf dest /var/backups/svn
 getconf tmp /var/backups/svn.tmp
-getconf HOTBACKUP /usr/lib/subversion/hot-backup.py
+getconf HOTBACKUP "/usr/bin/svnadmin hotcopy"
 getconf vsname	
 
 error=0
 
-# If vservers are configured, decide if the handler should
-# use them or if it should just operate on the host
-if [ "$vservers" = "yes" ]
-then
-	if [ ! -z $vsname ]
-	then		
-		info "Using vserver '$vsname'"
-		usevserver=1
-	else
-		info "No vserver name specified, actions will be performed on the host"
-	fi
-fi
-
-# If needed, make sure that the specified vserver exists and is running.
-if [ $usevserver ]
-then
-	info "examining vserver '$vsname'"
-        # does it exist ?
-	vroot="$VROOTDIR/$vsname"
-	[ -d $vroot ] || fatal "vserver '$vsname' does not exist at '$vroot'"
-        # is it running ?
-	running=`$VSERVERINFO $vsname RUNNING`
-	[ $running = 1 ] || fatal "vserver $vsname is not running."
+# Decide if the handler should operate on a vserver or on the host.
+# In the former case, check that $vsname exists and is running.
+local usevserver=no
+local vroot
+if [ $vservers_are_available = yes ]; then
+   if [ -n "$vsname" ]; then
+      # does it exist ?
+      if ! vservers_exist "$vsname" ; then
+         fatal "The vserver given in vsname ($vsname) does not exist."
+      fi
+      # is it running ?
+      $VSERVERINFO -q $vsname RUNNING
+      if [ $? -ne 0 ]; then
+         fatal "The vserver $vsname is not running."
+      fi
+      # everything ok
+      info "Using vserver '$vsname'."
+      usevserver=yes
+      vroot="$VROOTDIR/$vsname"
+   else
+      info "No vserver name specified, actions will be performed on the host."
+   fi
 fi
 
 cd $vroot$src
@@ -50,7 +50,7 @@ do
        error "command failed mkdir -p $vroot$tmp/$repo"
     fi
 
-    if [ $usevserver ]
+    if [ $usevserver = yes ]
     then
 	ret=`$VSERVER $vsname exec $HOTBACKUP $src/$repo $tmp/$repo 2>&1`
     else