From 0438f100ae1f376ae399197b0c817891d9558c29 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Thu, 17 Mar 2005 00:41:18 +0000 Subject: [PATCH] We need to run our post-processing activities after the end of the receiver's delay-update processing. --- generator.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/generator.c b/generator.c index 9a27c138..d4680d3d 100644 --- a/generator.c +++ b/generator.c @@ -1223,9 +1223,18 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) write_int(f_out, -1); - /* Read post-redo-phase MSG_DONE and any prior messages. */ + /* Read MSG_DONE for the redo phase (and any prior messages). */ get_redo_num(itemizing, code); + if (protocol_version >= 29) { + phase++; + if (verbose > 2) + rprintf(FINFO, "generate_files phase=%d\n", phase); + write_int(f_out, -1); + /* Read MSG_DONE for delay-update phase & prior messages. */ + get_redo_num(itemizing, code); + } + if (delete_after && !local_name && flist->count > 0) do_delete_pass(flist); @@ -1256,12 +1265,6 @@ void generate_files(int f_out, struct file_list *flist, char *local_name) io_error |= IOERR_DEL_LIMIT; } - if (protocol_version >= 29) { - write_int(f_out, -1); - /* Read post-delay-phase MSG_DONE and any prior messages. */ - get_redo_num(itemizing, code); - } - if (verbose > 2) rprintf(FINFO,"generate_files finished\n"); } -- 2.34.1