mirror of
https://github.com/RsyncProject/rsync.git
synced 2026-01-26 15:58:36 -05:00
Make sure that --dry-run with --del doesn't output extraneous info
when the dest directory does not exist.
This commit is contained in:
@@ -20,7 +20,19 @@ echo extra >"$todir"/emptydir/subdir/remove4
|
||||
|
||||
# Create two chk dirs, one with a copy of the source files, and one with
|
||||
# what we expect to be left behind by the copy using --remove-source-files.
|
||||
$RSYNC -av "$fromdir/" "$chkdir/copy/"
|
||||
# Also, make sure that --dry-run --del doesn't output anything extraneous.
|
||||
$RSYNC -av "$fromdir/" "$chkdir/copy/" >"$tmpdir/copy.out" 2>&1
|
||||
cat "$tmpdir/copy.out"
|
||||
grep -v '^\(created directory\|sent\|total size\) ' "$tmpdir/copy.out" >"$tmpdir/copy.new"
|
||||
mv "$tmpdir/copy.new" "$tmpdir/copy.out"
|
||||
|
||||
$RSYNC -avn --del "$fromdir/" "$chkdir/copy2/" >"$tmpdir/copy2.out" 2>&1 || true
|
||||
cat "$tmpdir/copy2.out"
|
||||
grep -v '^\(created directory\|sent\|total size\) ' "$tmpdir/copy2.out" >"$tmpdir/copy2.new"
|
||||
mv "$tmpdir/copy2.new" "$tmpdir/copy2.out"
|
||||
|
||||
diff $diffopt "$tmpdir/copy.out" "$tmpdir/copy2.out"
|
||||
|
||||
$RSYNC -av -f 'exclude,! */' "$fromdir/" "$chkdir/empty/"
|
||||
|
||||
checkit "$RSYNC -avv --del --remove-source-files \
|
||||
|
||||
Reference in New Issue
Block a user