[PATCH] Fix logic for sending --suffix-dels to the server.

Matt McCutchen matt at mattmccutchen.net
Wed Feb 6 18:41:33 GMT 2008


---
This goes on the backup-dir-dels branch.

 options.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/options.c b/options.c
index 0800c6f..4aa73bd 100644
--- a/options.c
+++ b/options.c
@@ -1920,8 +1920,9 @@ void server_options(char **args, int *argc_p)
 			goto oom;
 		args[ac++] = arg;
 	}
-	/* Only send --suffix-dels if it specifies a non-default value. */
-	if (strcmp(backup_suffix_dels, backup_dir_dels ? "" : BACKUP_SUFFIX) != 0) {
+	/* Only send --suffix-dels if it specifies a value different from the
+	 * --suffix value, which would normally be used for deletions too. */
+	if (strcmp(backup_suffix_dels, backup_suffix) != 0) {
 		/* We use the following syntax to avoid weirdness with '~'. */
 		if (asprintf(&arg, "--suffix-dels=%s", backup_suffix_dels) < 0)
 			goto oom;
-- 
1.5.4.rc3.15.g4bbc



More information about the rsync mailing list