Tweaked the output a little.
[rsync/rsync.git] / options.c
index 3c5ecb5..0abf6ce 100644 (file)
--- a/options.c
+++ b/options.c
@@ -117,7 +117,6 @@ int inplace = 0;
 int delay_updates = 0;
 long block_size = 0; /* "long" because popt can't set an int32. */
 
-
 /** Network address family. **/
 #ifdef INET6
 int default_af_hint = 0;       /* Any protocol */
@@ -1661,11 +1660,11 @@ void server_options(char **args,int *argc)
                        args[ac++] = "--delete";
                if (delete_before > 1)
                        args[ac++] = "--delete-before";
-               if (delete_during) {
-                       args[ac++] = delete_during == 2 ? "--delete-delay"
-                                                       : "--delete-during";
-               }
-               if (delete_after)
+               else if (delete_during == 2)
+                       args[ac++] = "--delete-delay";
+               else if (delete_during)
+                       args[ac++] = "--delete-during";
+               else if (delete_after)
                        args[ac++] = "--delete-after";
                if (force_delete)
                        args[ac++] = "--force";