X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Frdiff.in;h=bb704c5fddd11f169d6825bedca8e3a86bf87f11;hb=c0140aea9722188f761e6d2d8820f2f72bf4fc58;hp=aa02a5541944cf4f9c2f3c6f6f585590fe227451;hpb=02a7436b7c606efd82e215ffc238aac3d5e21f7f;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/handlers/rdiff.in b/handlers/rdiff.in index aa02a55..bb704c5 100644 --- a/handlers/rdiff.in +++ b/handlers/rdiff.in @@ -77,6 +77,7 @@ getconf options getconf testconnect yes getconf nicelevel 0 getconf bwlimit +getconf ignore_version no setsection source getconf type; sourcetype=$type @@ -127,7 +128,7 @@ if [ "$testconnect" = "yes" ] || [ "${test}" -eq 1 ]; then test_connection $destuser $desthost fi -if [ $ignore_version != "yes" ]; then +if [ "$ignore_version" != "yes" ]; then # see that rdiff-backup has the same version at the source and destination sourceversion=`get_version $sourceuser $sourcehost` destversion=`get_version $destuser $desthost` @@ -137,7 +138,6 @@ if [ $ignore_version != "yes" ]; then fi # source specific checks -[ "$include" != "" -o "$vsinclude" != "" ] || fatal "No source includes specified" case $sourcetype in remote ) execstr_sourcepart="$sourceuser@$sourcehost::/" ;; local ) execstr_sourcepart="/" ;; @@ -233,7 +233,7 @@ fi set +o noglob # exclude everything else -execstr="${execstr}--exclude '/*' " +[ "$include" != "" -o "$vsinclude" != "" ] && execstr="${execstr}--exclude '/*' " # include client-part and server-part execstr="${execstr}$execstr_sourcepart $execstr_destpart"