receiving side when a mount-point directory did not match a directory in
the transfer.
+ - Fixed the use of --dry-run with --read-batch.
+
- Fixed configure's erroneous use of target.
- Fixed configure's --disable-debug option.
rprintf(FERROR_XFER, "(No batched update for%s \"%s\")\n",
is_redo ? " resend of" : "", f_name(file, NULL));
- if (inc_recurse)
+ if (inc_recurse && !dry_run)
send_msg_int(MSG_NO_SEND, ndx);
}
exit_cleanup(RERR_PROTOCOL);
}
+ if (read_batch) {
+ int wanted = redoing
+ ? we_want_redo(ndx)
+ : gen_wants_ndx(ndx);
+ if (!wanted) {
+ rprintf(FINFO,
+ "(Skipping batched update for%s \"%s\")\n",
+ redoing ? " resend of" : "",
+ fname);
+ discard_receive_data(f_in, F_LENGTH(file));
+ file->flags |= FLAG_FILE_SENT;
+ continue;
+ }
+ }
+
if (!do_xfers) { /* log the transfer */
log_item(FCLIENT, file, &stats, iflags, NULL);
if (read_batch)
continue;
}
- if (read_batch) {
- if (!(redoing ? we_want_redo(ndx) : gen_wants_ndx(ndx))) {
- rprintf(FINFO,
- "(Skipping batched update for%s \"%s\")\n",
- redoing ? " resend of" : "",
- fname);
- discard_receive_data(f_in, F_LENGTH(file));
- file->flags |= FLAG_FILE_SENT;
- continue;
- }
- }
-
partialptr = partial_dir ? partial_dir_fname(fname) : fname;
if (protocol_version >= 29) {