mirror of
https://github.com/RsyncProject/rsync.git
synced 2026-03-13 11:56:14 -04:00
I realized that there were instances where --force could still be
required to be combined with a delete option (if a non-dir was overwriting a dir in a directory that was not included in the transfer), so I extended the change I just made for --delete-after to include all delete modes.
This commit is contained in:
@@ -45,6 +45,7 @@ extern int preserve_uid;
|
||||
extern int preserve_gid;
|
||||
extern int preserve_times;
|
||||
extern int omit_dir_times;
|
||||
extern int delete_mode;
|
||||
extern int delete_before;
|
||||
extern int delete_during;
|
||||
extern int delete_after;
|
||||
@@ -780,7 +781,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
|
||||
char *fnamecmp, *partialptr, *backupptr = NULL;
|
||||
char fnamecmpbuf[MAXPATHLEN];
|
||||
uchar fnamecmp_type;
|
||||
int del_opts = DEL_TERSE | (delete_after ? DEL_FORCE_RECURSE : 0);
|
||||
int del_opts = DEL_TERSE | (delete_mode ? DEL_FORCE_RECURSE : 0);
|
||||
|
||||
if (list_only)
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user