From 8324bd5c21e422c82488903ebded6198ca90782d Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 19 Feb 2005 22:16:53 +0000 Subject: [PATCH] When logging PERMS_REPORT messages, send them with the FCLIENT code if the daemon has "%i" in its log message (because it already got a detailed log message from the generator). --- rsync.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/rsync.c b/rsync.c index 4c34deb4..4bf8b8ab 100644 --- a/rsync.c +++ b/rsync.c @@ -24,7 +24,7 @@ extern int verbose; extern int dry_run; -extern int itemize_changes; +extern int daemon_log_format_has_i; extern int preserve_times; extern int omit_dir_times; extern int am_root; @@ -231,10 +231,12 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st, #endif if (verbose > 1 && flags & PERMS_REPORT) { + enum logcode code = daemon_log_format_has_i || dry_run + ? FCLIENT : FINFO; if (updated) - rprintf(FINFO, "%s\n", safe_fname(fname)); + rprintf(code, "%s\n", safe_fname(fname)); else - rprintf(FINFO, "%s is uptodate\n", safe_fname(fname)); + rprintf(code, "%s is uptodate\n", safe_fname(fname)); } return updated; } -- 2.34.1