DO NOT REPLY [Bug 3653] Silence 'vanished files' messages

[samba-bugs at samba.org]

https://bugzilla.samba.org/show_bug.cgi?id=3653





------- Comment #1 from count-samba at flatline.de  2006-04-03 07:13 MST -------
diff -u -r1.332 options.c
--- options.c   28 Mar 2006 23:09:36 -0000      1.332
+++ options.c   3 Apr 2006 12:12:44 -0000
@@ -113,6 +113,7 @@
 int checksum_seed = 0;
 int inplace = 0;
 int delay_updates = 0;
+int ignore_vanished = 0;
 long block_size = 0; /* "long" because popt can't set an int32. */


@@ -491,6 +492,7 @@
   {"no-partial",       0,  POPT_ARG_VAL,    &keep_partial, 0, 0, 0 },
   {"partial-dir",      0,  POPT_ARG_STRING, &partial_dir, 0, 0, 0 },
   {"delay-updates",    0,  POPT_ARG_NONE,   &delay_updates, 0, 0, 0 },
+  {"ignore-vanished",  0,  POPT_ARG_NONE,   &ignore_vanished, 0, 0, 0 },
   {"prune-empty-dirs",'m', POPT_ARG_NONE,   &prune_empty_dirs, 0, 0, 0 },
   {"log-format",       0,  POPT_ARG_STRING, &log_format, 0, 0, 0 },
   {"itemize-changes", 'i', POPT_ARG_NONE,   0, 'i', 0, 0 },
diff -u -r1.92 sender.c
--- sender.c    14 Jan 2006 20:26:24 -0000      1.92
+++ sender.c    3 Apr 2006 12:12:44 -0000
@@ -41,6 +41,7 @@
 extern struct stats stats;
 extern struct file_list *the_file_list;
 extern char *log_format;
+extern int ignore_vanished;


 /**
@@ -296,12 +297,14 @@
                fd = do_open(fname, O_RDONLY, 0);
                if (fd == -1) {
                        if (errno == ENOENT) {
-                               enum logcode c = am_daemon
+                               if (!ignore_vanished) {
+                                       enum logcode c = am_daemon
                                    && protocol_version < 28 ? FERROR
                                                             : FINFO;
-                               io_error |= IOERR_VANISHED;
-                               rprintf(c, "file has vanished: %s\n",
-                                       full_fname(fname));
+                                       io_error |= IOERR_VANISHED;
+                                       rprintf(c, "file has vanished: %s\n",
+                                                       full_fname(fname));
+                               }
                        } else {
                                io_error |= IOERR_GENERAL;
                                rsyserr(FERROR, errno,


-- 
Configure bugmail: https://bugzilla.samba.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA contact for the bug, or are watching the QA contact.