diff options
| author | Wayne Davison <wayned@samba.org> | 2006-01-21 19:54:14 +0000 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2006-01-21 19:54:14 +0000 |
| commit | b8a39ed58af2859c3a4f2251866c8cf277f92516 (patch) | |
| tree | fa106602f7b0f622100cc03534a2391974ee51b5 /exclude.c | |
| parent | f5a910dd7307f7e930c3f5d4b53e5e4c57deb6c4 (diff) | |
| download | rsync-b8a39ed58af2859c3a4f2251866c8cf277f92516.tar.gz | |
Use the new saw_delete* variables to ensure that the server side
always reads the exclude information when it is present.
Diffstat (limited to 'exclude.c')
| -rw-r--r-- | exclude.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -34,6 +34,8 @@ extern int list_only; extern int recurse; extern int io_error; extern int local_server; +extern int saw_delete_opt; +extern int saw_delete_excluded_opt; extern int delete_mode; extern int delete_excluded; extern int cvs_exclude; @@ -1179,8 +1181,8 @@ void recv_filter_list(int f_in) { char line[BIGPATHBUFLEN]; int xflags = protocol_version >= 29 ? 0 : XFLG_OLD_PREFIXES; - int receiver_wants_list = delete_mode - && (!delete_excluded || protocol_version >= 29); + int receiver_wants_list = saw_delete_opt + && (!saw_delete_excluded_opt || protocol_version >= 29); unsigned int len; if (!local_server && (am_sender || receiver_wants_list)) { |