diff options
author | intrigeri <intrigeri@boum.org> | 2006-01-19 21:57:11 +0000 |
---|---|---|
committer | intrigeri <intrigeri@boum.org> | 2006-01-19 21:57:11 +0000 |
commit | e431f13bcc7136b1b45837475adb1f23bdeda38b (patch) | |
tree | 7b38c3b3e00fcdb61c04861f4b36c58b38125847 /handlers/rdiff | |
parent | 22bea56d9e8bf5c4645a628fe8e9f08f8b29e675 (diff) | |
download | backupninja-e431f13bcc7136b1b45837475adb1f23bdeda38b.tar.gz backupninja-e431f13bcc7136b1b45837475adb1f23bdeda38b.tar.bz2 |
rdiff: fixed globbing bug for include, exclude and vsinclude (again.)
Diffstat (limited to 'handlers/rdiff')
-rw-r--r-- | handlers/rdiff | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/handlers/rdiff b/handlers/rdiff index e2ab5e8..1a2e1eb 100644 --- a/handlers/rdiff +++ b/handlers/rdiff @@ -94,7 +94,7 @@ check_consistency "destination" "$type" "$user" "$host" # See if vservers are configured local usevserver=no -if [ $vservers_are_available = yes ]; then +if [ $vservers_are_available = yes -a -n "$vsinclude" ]; then info "vserver method enabled" usevserver=yes fi @@ -160,12 +160,12 @@ execstr="$RDIFFBACKUP $options --print-statistics " # TODO: order the includes and excludes # excludes -for i in $exclude; do +for i in "$exclude"; do str="${i//__star__/*}" execstr="${execstr}--exclude '$str' " done # includes -for i in $include; do +for i in "$include"; do [ "$i" != "/" ] || fatal "Sorry, you cannot use 'include = /'" str="${i//__star__/*}" execstr="${execstr}--include '$str' " @@ -174,7 +174,7 @@ done # vsinclude if [ $usevserver = yes ]; then for vserver in `ls $VROOTDIR|grep -v lost+found`; do - for vi in $vsinclude; do + for vi in "$vsinclude"; do str="${vi//__star__/*}" execstr="${execstr}--include '$VROOTDIR/$vserver$str' " done |