From: Wayne Davison Date: Tue, 23 Jun 2020 22:53:47 +0000 (-0700) Subject: Avoid -U if --atimes is disabled. X-Git-Tag: v3.2.2pre1~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d1fdf9ff8dad4f64259d78f8bc912aed782848d9;p=thirdparty%2Frsync.git Avoid -U if --atimes is disabled. --- diff --git a/testsuite/daemon.test b/testsuite/daemon.test index a8acd04e..a736ee83 100644 --- a/testsuite/daemon.test +++ b/testsuite/daemon.test @@ -91,12 +91,13 @@ drwxr-xr-x DIR ####/##/## ##:##:## foo EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed" -$RSYNC -rU localhost::test-from/f* \ - | sed "$FILE_REPL" | sed "$DIR_REPL" | sed "$LS_REPL" \ - | tee "$outfile" -cat <"$chkfile" +if $RSYNC --version | grep "[, ] atimes" >/dev/null; then + $RSYNC -rU localhost::test-from/f* \ + | sed "$FILE_REPL" | sed "$DIR_REPL" | sed "$LS_REPL" \ + | tee "$outfile" + cat <"$chkfile" drwxr-xr-x DIR ####/##/## ##:##:## foo -rw-r--r-- 4 ####/##/## ##:##:## ####/##/## ##:##:## foo/one EOT -diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed" - + diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed" +fi