cleanup_disable();
if (!recv_ok) {
- if (csum_length == SUM_LENGTH) {
- rprintf(FERROR,"ERROR: file corruption in %s. File changed during transfer?\n",
- full_fname(fname));
- } else {
+ int msgtype = csum_length == SUM_LENGTH || read_batch ?
+ FERROR : FINFO;
+ if (msgtype == FERROR || verbose) {
+ char *errstr, *redostr;
+ char *keptstr = keep_partial || inplace ?
+ "retain" : "discard";
+ if (msgtype == FERROR) {
+ errstr = "ERROR";
+ redostr = "";
+ } else {
+ errstr = "WARNING";
+ redostr = " (will try again)";
+ }
+ rprintf(msgtype,
+ "%s: %s failed verification -- update %sed%s.\n",
+ errstr, fname, keptstr, redostr);
+ }
+ if (csum_length != SUM_LENGTH) {
char buf[4];
- if (verbose > 1)
- rprintf(FINFO,"redoing %s(%d)\n",fname,i);
SIVAL(buf, 0, i);
send_msg(MSG_REDO, buf, 4);
}
}
make_backups = save_make_backups;
- if (delete_after && recurse && delete_mode && !local_name
- && flist->count > 0)
+ if (delete_after && recurse && !local_name && flist->count > 0)
delete_files(flist);
if (verbose > 2)