[PATCH] Make pushing a daemon-excluded file an FERROR_XFER, and improve the message.

Matt McCutchen matt at mattmccutchen.net
Thu Feb 7 18:46:32 GMT 2008


---
If the user wants to push a file but a daemon exclude prevents the push,
rsync hasn't done as the user asked, so rsync should issue a code 23.
(I take a different stance here than in bug 3825 comment 11 because
here, the overriding behavior is requested by the daemon administrator,
not the user.)

 generator.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/generator.c b/generator.c
index e4e5635..4eb5325 100644
--- a/generator.c
+++ b/generator.c
@@ -1229,11 +1229,9 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 				excluded_dir = file;
 			}
 		  skipping:
-			if (verbose) {
-				rprintf(FINFO,
-					"skipping server-excluded file \"%s\"\n",
-					fname);
-			}
+			rprintf(FERROR_XFER,
+				"skipping daemon-excluded file \"%s\"\n",
+				fname);
 			return;
 		}
 	}
-- 
1.5.4.rc3.15.g4bbc



More information about the rsync mailing list