Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c94e4af
)
Turn off make_backups during the redo phase, just like the receiver.
author
Wayne Davison
<wayned@samba.org>
Tue, 7 Sep 2004 21:32:36 +0000
(21:32 +0000)
committer
Wayne Davison
<wayned@samba.org>
Tue, 7 Sep 2004 21:32:36 +0000
(21:32 +0000)
sender.c
patch
|
blob
|
blame
|
history
diff --git
a/sender.c
b/sender.c
index
1436eb6
..
a2d0a86
100644
(file)
--- a/
sender.c
+++ b/
sender.c
@@
-27,6
+27,7
@@
extern int dry_run;
extern int am_server;
extern int am_daemon;
extern int protocol_version;
extern int am_server;
extern int am_daemon;
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)
struct file_struct *file;
int phase = 0;
struct stats initial_stats;
struct file_struct *file;
int phase = 0;
struct stats initial_stats;
+ int save_make_backups = make_backups;
int j;
if (verbose > 2)
int j;
if (verbose > 2)
@@
-136,6
+138,8
@@
void send_files(struct file_list *flist, int f_out, int f_in)
write_int(f_out, -1);
if (verbose > 2)
rprintf(FINFO, "send_files phase=%d\n", phase);
write_int(f_out, -1);
if (verbose > 2)
rprintf(FINFO, "send_files phase=%d\n", phase);
+ /* inplace resends run without a backup file */
+ make_backups = 0;
continue;
}
break;
continue;
}
break;
@@
-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)
rprintf(FINFO, "send files finished\n");
if (verbose > 2)
rprintf(FINFO, "send files finished\n");