diff options
| author | Wayne Davison <wayned@samba.org> | 2005-02-15 07:20:04 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2005-02-15 07:20:04 +0000 |
| commit | a8ed49583304181a0516ce98014ae7389ec4c160 (patch) | |
| tree | 4f27bf4e0aa12d2f69a24bdcf8915ee31127aee4 /receiver.c | |
| parent | 4a14ed068c11de398df96a7c462c883b11b3e317 (diff) | |
| download | rsync-a8ed49583304181a0516ce98014ae7389ec4c160.tar.gz rsync-a8ed49583304181a0516ce98014ae7389ec4c160.tar.bz2 rsync-a8ed49583304181a0516ce98014ae7389ec4c160.zip | |
If -w and -v are both on, don't output the "log the transfer"
verbose message.
Diffstat (limited to 'receiver.c')
| -rw-r--r-- | receiver.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -21,6 +21,7 @@ #include "rsync.h" extern int verbose; +extern int what_has_changed; extern int delete_after; extern int csum_length; extern struct stats stats; @@ -387,8 +388,8 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, if (verbose > 2) rprintf(FINFO, "recv_files(%s)\n", safe_fname(fname)); - if (dry_run) { - if (!am_server && verbose) /* log the transfer */ + if (dry_run) { /* log the transfer */ + if (!am_server && verbose && !what_has_changed) rprintf(FINFO, "%s\n", safe_fname(fname)); continue; } @@ -531,7 +532,8 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, cleanup_set(fnametmp, partialptr, file, fd1, fd2); } - if (!am_server && verbose) /* log the transfer */ + /* log the transfer */ + if (!am_server && verbose && !what_has_changed) rprintf(FINFO, "%s\n", safe_fname(fname)); /* recv file data */ |