- Don't log a delete message to the daemon log in dry-run mode.

[rsync/rsync.git] / log.c

diff --git a/log.c b/log.c
index 70aa96d..47fbf15 100644 (file)
--- a/log.c
+++ b/log.c
@@ -27,7 +27,7 @@
   */
 #include "rsync.h"
 
-extern int itemize_changes;
+extern int dry_run;
 extern int am_daemon;
 extern int am_server;
 extern int am_sender;
@@ -36,6 +36,7 @@ extern int module_id;
 extern int msg_fd_out;
 extern int protocol_version;
 extern int preserve_times;
+extern int log_format_has_o_or_i;
 extern char *auth_user;
 extern char *log_format;
 
@@ -534,12 +535,12 @@ void log_delete(char *fname, int mode)
                if (S_ISDIR(mode))
                        len++; /* directories include trailing null */
                send_msg(MSG_DELETED, fname, len);
-               if (!am_daemon)
+               if (!am_daemon || dry_run)
                        return;
                fmt = lp_log_format(module_id);
                code = FLOG;
        } else {
-               fmt = log_format && itemize_changes ? log_format : "%i %n";
+               fmt = log_format_has_o_or_i ? log_format : "%i %n";
                code = FINFO;
        }
 
@@ -556,7 +557,7 @@ void log_delete(char *fname, int mode)
 void log_exit(int code, const char *file, int line)
 {
        if (code == 0) {
-               rprintf(FLOG,"wrote %.0f bytes  read %.0f bytes  total size %.0f\n",
+               rprintf(FLOG,"sent %.0f bytes  received %.0f bytes  total size %.0f\n",
                        (double)stats.total_written,
                        (double)stats.total_read,
                        (double)stats.total_size);