Rsync 2.6.9 Develops Conflict Between --stats, I think --delete-after and Local Filesystem Replication

[Wayne Davison]

On Sun, Dec 10, 2006 at 05:44:45AM -0000, Sabahattin Gucukoglu wrote:
> [...show stats...]
> unknown message 4:1 [generator]

The problem is the combination of -vv with --stats.  This is the only
way to get a remote receiver to generate an FCLIENT class log message
(which goes to the client, and not to any active --log-file).  The other
receiver-sent FCLIENT messages can only occur when the receiver is on
the local side, which allows it to output them to the user without
sending them to the generator first.

The attached patch fixes this.

..wayne..
-------------- next part --------------
--- io.c	6 Dec 2006 01:32:17 -0000	1.207
+++ io.c	10 Dec 2006 14:44:29 -0000
@@ -311,6 +311,7 @@ static void read_msg_fd(void)
 	case MSG_INFO:
 	case MSG_ERROR:
 	case MSG_LOG:
+	case MSG_CLIENT:
 		while (len) {
 			n = len;
 			if (n >= sizeof buf)
--- rsync.h	9 Dec 2006 00:24:08 -0000	1.313
+++ rsync.h	10 Dec 2006 14:44:29 -0000
@@ -174,7 +174,7 @@ enum logcode { FNONE=0, FERROR=1, FINFO=
 enum msgcode {
 	MSG_DATA=0,	/* raw data on the multiplexed stream */
 	MSG_ERROR=FERROR, MSG_INFO=FINFO, /* remote logging */
-	MSG_LOG=FLOG, MSG_SOCKERR=FSOCKERR, /* sibling logging */
+	MSG_LOG=FLOG, MSG_CLIENT=FCLIENT, MSG_SOCKERR=FSOCKERR, /* sibling logging */
 	MSG_REDO=9,	/* reprocess indicated flist index */
 	MSG_SUCCESS=100,/* successfully updated indicated flist index */
 	MSG_DELETED=101,/* successfully deleted a file on receiving side */