[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  5bfe006 Make daemon-exclude errors more error-like. Fixes bug 7765.
      from  852585b Check if sender file changed before allowing a remove. Fixes bug 7691.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5bfe00688206cde3cbc603e8d47b28788a19ca3a
Author: Wayne Davison <wayned at samba.org>
Date:   Sat Jun 18 12:44:26 2011 -0700

    Make daemon-exclude errors more error-like.
    Fixes bug 7765.

-----------------------------------------------------------------------

Summary of changes:
 generator.c |    2 +-
 main.c      |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/generator.c b/generator.c
index b8d930e..8491300 100644
--- a/generator.c
+++ b/generator.c
@@ -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,
-				"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;
diff --git a/main.c b/main.c
index 16b283c..5a06f17 100644
--- a/main.c
+++ b/main.c
@@ -594,7 +594,7 @@ static char *get_local_name(struct file_list *flist, char *dest_path)
 		if ((*dest_path != '.' || dest_path[1] != '\0')
 		 && (check_filter(&daemon_filter_list, FLOG, dest_path, 0) < 0
 		  || check_filter(&daemon_filter_list, FLOG, dest_path, 1) < 0)) {
-			rprintf(FERROR, "skipping daemon-excluded destination \"%s\"\n",
+			rprintf(FERROR, "ERROR: daemon has excluded destination \"%s\"\n",
 				dest_path);
 			exit_cleanup(RERR_FILESELECT);
 		}


-- 
The rsync repository.