cleanup_disable();
if (!recv_ok) {
- int msgtype;
- char *redostr;
+ 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];
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);
}
}
}