aboutsummaryrefslogtreecommitdiffstats
path: root/main.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2005-02-15 07:20:11 +0000
committerWayne Davison <wayned@samba.org>2005-02-15 07:20:11 +0000
commit93c31c1a6d1016924acea01791d6453de75063b6 (patch)
tree7584cfd53b64b70598a344a35ffa276ef2ff038f /main.c
parenta8ed49583304181a0516ce98014ae7389ec4c160 (diff)
downloadandroid_external_rsync-93c31c1a6d1016924acea01791d6453de75063b6.tar.gz
android_external_rsync-93c31c1a6d1016924acea01791d6453de75063b6.tar.bz2
android_external_rsync-93c31c1a6d1016924acea01791d6453de75063b6.zip
Don't force -v with -n if -w was specified.
Diffstat (limited to 'main.c')
-rw-r--r--main.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/main.c b/main.c
index fc67eae2..46d4f69f 100644
--- a/main.c
+++ b/main.c
@@ -30,6 +30,7 @@ extern int am_sender;
extern int am_generator;
extern int am_daemon;
extern int verbose;
+extern int what_has_changed;
extern int blocking_io;
extern int delete_before;
extern int daemon_over_rsh;
@@ -1173,8 +1174,8 @@ int main(int argc,char *argv[])
exit_cleanup(RERR_SYNTAX);
}
- if (dry_run)
- verbose = MAX(verbose,1);
+ if (dry_run && !verbose && !what_has_changed)
+ verbose = 1;
if (am_server) {
set_nonblocking(STDIN_FILENO);