The branch, master has been updated via e9398b1 Fix a typo that Stefan Beller pointed out. via 83792c1 A delete_item() error should use FERROR_XFER. Fixes bug 10024. from 32540aa Tweak log_delete() to send MSG_DELETED more.
;a=shortlog;h=master - Log ----------------------------------------------------------------- commit e9398b1dc56ba370365f5faa57edbb35f44fb606 Author: Wayne Davison <way...@samba.org> Date: Sat Dec 14 16:25:18 2013 -0800 Fix a typo that Stefan Beller pointed out. commit 83792c1cbfea324d5d5b49deea14f6a53031b5d4 Author: Wayne Davison <way...@samba.org> Date: Sun Dec 1 15:58:17 2013 -0800 A delete_item() error should use FERROR_XFER. Fixes bug 10024. ----------------------------------------------------------------------- Summary of changes: delete.c | 2 +- exclude.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/delete.c b/delete.c index 13358dd..cab7b5d 100644 --- a/delete.c +++ b/delete.c @@ -199,7 +199,7 @@ enum delret delete_item(char *fbuf, uint16 mode, uint16 flags) fbuf); ret = DR_NOT_EMPTY; } else if (errno != ENOENT) { - rsyserr(FERROR, errno, "delete_file: %s(%s) failed", + rsyserr(FERROR_XFER, errno, "delete_file: %s(%s) failed", what, fbuf); ret = DR_FAILURE; } else diff --git a/exclude.c b/exclude.c index a7331e2..b7aaa17 100644 --- a/exclude.c +++ b/exclude.c @@ -356,7 +356,7 @@ static char *parse_merge_name(const char *merge_file, unsigned int *len_ptr, fn_len = clean_fname(fn, CFN_COLLAPSE_DOT_DOT_DIRS); } - /* If the name isn't in buf yet, it's wasn't absolute. */ + /* If the name isn't in buf yet, it wasn't absolute. */ if (fn != buf) { int d_len = dirbuf_len - prefix_skip; if (d_len + fn_len >= MAXPATHLEN) { -- The rsync repository. _______________________________________________ rsync-cvs mailing list rsync-cvs@lists.samba.org https://lists.samba.org/mailman/listinfo/rsync-cvs