Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make daemon-exclude errors more error-like.
[rsync/rsync.git]
/
generator.c
diff --git
a/generator.c
b/generator.c
index
cd7abda
..
8491300
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-288,7
+288,7
@@
static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
if (allowed_lull)
maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH);
if (allowed_lull)
maybe_send_keepalive(time(NULL), MSK_ALLOW_FLUSH);
- if (io_error && !ignore_errors) {
+ if (io_error &
IOERR_GENERAL &
& !ignore_errors) {
if (already_warned)
return;
rprintf(FINFO,
if (already_warned)
return;
rprintf(FINFO,
@@
-1178,7
+1178,7
@@
static void recv_generator(char *fname, struct file_struct *file, int ndx,
handle_skipped_hlink(file, itemizing, code, f_out);
#endif
rprintf(FERROR_XFER,
handle_skipped_hlink(file, itemizing, code, f_out);
#endif
rprintf(FERROR_XFER,
- "
skipping daemon-excluded
%s \"%s\"\n",
+ "
ERROR: daemon refused to receive
%s \"%s\"\n",
is_dir ? "directory" : "file", fname);
if (is_dir)
goto skipping_dir_contents;
is_dir ? "directory" : "file", fname);
if (is_dir)
goto skipping_dir_contents;