X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Frdiff;h=8faca9d654a827b7d447c48736c1ef1515e7b302;hb=b5130c49410c6c1300b9c8f6246a61c4d1e66004;hp=8f0edfb558ffd6ef4bbe24caf8acc210629c11ae;hpb=a65bc7af30e0ba963a007bc47b6287054bc2f276;p=matthijs%2Fupstream%2Fbackupninja.git diff --git a/handlers/rdiff b/handlers/rdiff index 8f0edfb..8faca9d 100644 --- a/handlers/rdiff +++ b/handlers/rdiff @@ -155,7 +155,7 @@ fi removestr="${removestr}${destdir}/${label}"; debug "$removestr" -if [ ! $test ]; then +if [ $test = 0 ]; then output=`$removestr 2>&1` if [ $? = 0 ]; then debug $output @@ -182,7 +182,7 @@ for i in $exclude; do if [ -n "$str" ]; then execstr="${execstr}--exclude '$str' " else - warning "exclude statement ${i//__star__/*} will be ignored. $symlinks_warning" + warning "exclude statement '${i//__star__/*}' will be ignored. $symlinks_warning" fi done # includes @@ -193,7 +193,7 @@ for i in $include; do if [ -n "$str" ]; then execstr="${execstr}--include '$str' " else - warning "include statement ${i//__star__/*} will be ignored. $symlinks_warning" + warning "include statement '${i//__star__/*}' will be ignored. $symlinks_warning" fi done @@ -206,7 +206,7 @@ if [ $usevserver = yes ]; then if [ -n "$str" ]; then execstr="${execstr}--include '$str' " else - warning "vsinclude statement ${vi//__star__/*} will be ignored for VServer $vserver. $symlinks_warning" + warning "vsinclude statement '${vi//__star__/*}' will be ignored for VServer $vserver. $symlinks_warning" fi done done @@ -221,7 +221,7 @@ execstr="${execstr}--exclude '/*' " execstr="${execstr}$execstr_sourcepart $execstr_destpart" debug "$execstr" -if [ ! $test ]; then +if [ $test = 0 ]; then output=`nice -n $nicelevel su -c "$execstr" 2>&1` if [ $? = 0 ]; then debug $output