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

diff --git a/ChangeLog b/ChangeLog
index ac97127b4512a4c7b23add3146fc2a6b2800058d..691620c272a7dde18eaf73d8d0b8678920653b86 100644 (file)
--- 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 82160f4fb5b03b86a36cdf45a4944611672dc383..dc985019fa6df2ae0b44420199f13aa44cb9cdaf 100644 (file)
--- 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