Commit e2bc4126 authored by Wayne Davison's avatar Wayne Davison

Added a warning message when a file fails to verify, letting the user

know if we retained it or discarded it.  Especially useful for batch-
reading mode where the old code could look like it did the update when
it really silently failed.
parent e3442095
......@@ -552,15 +552,25 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
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;
char *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);
msgtype = read_batch ? FERROR : FINFO;
redostr = read_batch ? " Redo doubtful."
: " Redo pending.";
} else {
msgtype = FERROR;
redostr = "";
}
if (verbose || read_batch) {
rprintf(msgtype,
"%s: %s failed verification. Update %sed.%s\n",
msgtype == FERROR ? "ERROR" : "WARNING",
fname, keep_partial || inplace ?
"retain" : "discard", redostr);
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment