From: intrigeri <intrigeri@boum.org>
Date: Thu, 19 Jan 2006 21:57:28 +0000 (+0000)
Subject: handlers/rdiff: make use of new lib/vserver functionality
X-Git-Tag: backupninja-0.9.3~25
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=b7dd0cbf8138bb02b5309ac98db10705ab40312e;p=matthijs%2Fupstream%2Fbackupninja.git

handlers/rdiff: make use of new lib/vserver functionality
---

diff --git a/ChangeLog b/ChangeLog
index ac97127..691620c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,13 +17,16 @@ version 0.9.3 -- unreleased
 	 . now works when multiple vservers names are given (separated by space)
 	   in vsnames config variable
 	 . make use of new lib/vserver functionality
+        rdiff
+	 . make use of new lib/vserver functionality
+	 . fixed globbing bug in include, exclude and vsinclude options
     ninjahelper changes
         rdiff.helper:
          . fixed errors in create remote dir
          . code formatting cleanup (three spaces indent)
          . fixed bug which caused only first include/exclude dir to
            have "include = "
-         . fixed globbing bug with include and exclude (twice ;)
+         . fixed globbing bug with exclude
         ninjahelper:
          . now reports error if the helper script has a syntax error or bombs out.
          . code formatting cleanup (three spaces indent)
diff --git a/handlers/rdiff b/handlers/rdiff
index 82160f4..dc98501 100644
--- a/handlers/rdiff
+++ b/handlers/rdiff
@@ -172,12 +172,12 @@ done
 
 # vsinclude
 if [ $usevserver = yes ]; then
-	for vserver in `ls $VROOTDIR|grep -v lost+found`; do
-		for vi in "$vsinclude"; do
-			str="${vi//__star__/*}"
-			execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
-		done
-	done
+   for vserver in $found_vservers; do
+      for vi in "$vsinclude"; do
+	 str="${vi//__star__/*}"
+	 execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
+      done
+   done
 fi
 
 # exclude everything else