X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Frdiff;h=1a2e1ebb37eaacfea7b5c88d4e0de3b74d6b0b0b;hb=e799f6f54f60d2b01c799dbd00f1a96cd669557c;hp=e2ab5e8ac9dabfedd3fea44951a2f99977423d58;hpb=0b59fb33e45214d49ae7dcc32b6efa0aa88c1a4b;p=matthijs%2Fupstream%2Fbackupninja-vserver.git 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