Commit 8b115ac8 authored by Wayne Davison's avatar Wayne Davison

Turn off make_backups during the redo phase, just like the receiver.

parent c94e4afb
...@@ -27,6 +27,7 @@ extern int dry_run; ...@@ -27,6 +27,7 @@ extern int dry_run;
extern int am_server; extern int am_server;
extern int am_daemon; extern int am_daemon;
extern int protocol_version; extern int protocol_version;
extern int make_backups;
extern struct stats stats; extern struct stats stats;
...@@ -120,6 +121,7 @@ void send_files(struct file_list *flist, int f_out, int f_in) ...@@ -120,6 +121,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
struct file_struct *file; struct file_struct *file;
int phase = 0; int phase = 0;
struct stats initial_stats; struct stats initial_stats;
int save_make_backups = make_backups;
int j; int j;
if (verbose > 2) if (verbose > 2)
...@@ -136,6 +138,8 @@ void send_files(struct file_list *flist, int f_out, int f_in) ...@@ -136,6 +138,8 @@ void send_files(struct file_list *flist, int f_out, int f_in)
write_int(f_out, -1); write_int(f_out, -1);
if (verbose > 2) if (verbose > 2)
rprintf(FINFO, "send_files phase=%d\n", phase); rprintf(FINFO, "send_files phase=%d\n", phase);
/* inplace resends run without a backup file */
make_backups = 0;
continue; continue;
} }
break; break;
...@@ -253,6 +257,7 @@ void send_files(struct file_list *flist, int f_out, int f_in) ...@@ -253,6 +257,7 @@ void send_files(struct file_list *flist, int f_out, int f_in)
safe_fname(fname)); safe_fname(fname));
} }
} }
make_backups = save_make_backups;
if (verbose > 2) if (verbose > 2)
rprintf(FINFO, "send files finished\n"); rprintf(FINFO, "send files finished\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment