X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/65ba6af61b44031adff77a199de261a8420df184..2b967218eb530c649fe342faab4470a4ad4036d4:/generator.c diff --git a/generator.c b/generator.c index 0dda9f41..b3a31f05 100644 --- a/generator.c +++ b/generator.c @@ -7,8 +7,9 @@ * Copyright (C) 2003-2007 Wayne Davison * * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 3 as - * published by the Free Software Foundation. + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -1908,7 +1909,7 @@ void generate_files(int f_out, const char *local_name) f_name(fp, fbuf); ndx = cur_flist->ndx_start - 1; recv_generator(fbuf, fp, ndx, itemizing, code, f_out); - if (delete_during) { + if (delete_during && dry_run < 2) { if (BITS_SETnUNSET(fp->flags, FLAG_XFER_DIR, FLAG_MISSING_DIR)) { dev_t dirdev; if (one_file_system) {