mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-01-27 08:19:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

- Don't complain if --dry-run is specified with --read-batch

Browse Source 
or --write-batch.
- If --write-batch is combined with --dry-run, just disable
  --write-batch (that avoids trying to create a batch file
  and tells the user what would be transferred).
This commit is contained in:
Wayne Davison
2005-03-24 16:41:16 +00:00
parent f957e8fdf9
commit 254ee3baab
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
options.c
View File

@@ -901,12 +901,6 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
return 0;
}
if (write_batch || read_batch) {
if (dry_run) {
snprintf(err_buf, sizeof err_buf,
"--%s-batch cannot be used with --dry_run (-n)\n",
write_batch ? "write" : "read");
return 0;
}
if (am_server) {
rprintf(FINFO,
"ignoring --%s-batch option sent to server\n",
@@ -916,7 +910,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
* batch args to server. */
read_batch = write_batch = 0;
batch_name = NULL;
}
} else if (dry_run)
write_batch = 0;
}
if (read_batch && files_from) {
snprintf(err_buf, sizeof err_buf,