diff options
| author | Wayne Davison <wayned@samba.org> | 2005-02-19 22:16:53 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2005-02-19 22:16:53 +0000 |
| commit | 8324bd5c21e422c82488903ebded6198ca90782d (patch) | |
| tree | e80593bad0af7d2007f338a983adb0d729ab1f8d /rsync.c | |
| parent | 7f37167da56a6e1f7e7d3506835296038496cfcb (diff) | |
| download | android_external_rsync-8324bd5c21e422c82488903ebded6198ca90782d.tar.gz android_external_rsync-8324bd5c21e422c82488903ebded6198ca90782d.tar.bz2 android_external_rsync-8324bd5c21e422c82488903ebded6198ca90782d.zip | |
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).
Diffstat (limited to 'rsync.c')
| -rw-r--r-- | rsync.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -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; } |