From: micah <micah@758a04ac-41e6-0310-8a23-8373a73cc35d>
Date: Wed, 25 Jun 2008 03:27:06 +0000 (+0000)
Subject: stop failing on all the trac backups if just one fails
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=bc37e4ba61342cd0cddded9b0ba434560fc752fd;p=matthijs%2Fupstream%2Fbackupninja.git

stop failing on all the trac backups if just one fails

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

diff --git a/ChangeLog b/ChangeLog
index 3461200..73a38f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,6 +52,9 @@ version 0.9.6 -- unreleased
 	 . Added more robust software RAID information capture by running mdadm
 	   -Q --detail /dev/md?* because some people may have empty mdadm.conf files
 	   (Thanks to John Hallam).
+	trac:
+	 . stop failing on all the trac backups if just one fails, this means
+	   removing the temporary trac backup directories if they fail
 
 version 0.9.5 -- December 2, 2007
     backupninja changes
diff --git a/handlers/trac.in b/handlers/trac.in
index 0460c9f..a4b7bdf 100644
--- a/handlers/trac.in
+++ b/handlers/trac.in
@@ -9,7 +9,6 @@ getconf src /var/lib/trac
 getconf dest /var/backups/trac
 getconf tmp /var/backups/trac.tmp
 
-error=0
 cd $src
 for repo in `find . -name VERSION`
 do
@@ -38,19 +37,14 @@ do
     fi
     if [ $code != 0 ]; then
        error "command failed -- trac-admin $src/$repo hotcopy $tmp/$repo"
-       error=1
     fi
 done
 
-if [ $error -eq 1 ]; then
-    echo "Error: because of earlier errors, we are leaving trac backups in $tmp instead of $dest"
-else
-    if [ -d $dest -a -d $tmp ]; then
-        rm -rf $dest
-    fi
-    if [ -d $tmp ]; then
-        mv $tmp $dest
-    fi
+if [ -d $dest -a -d $tmp ]; then
+     rm -rf $dest
+fi
+if [ -d $tmp ]; then
+     mv $tmp $dest
 fi
 
 exit 0