From: Wayne Davison <wayned@samba.org>
Date: Thu, 19 May 2005 00:00:28 +0000 (+0000)
Subject: One place that was testing errno for ENOTEMPTY was failing to
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/4d474ad51386138c7c09bcffa328cd98c4d8dddf

One place that was testing errno for ENOTEMPTY was failing to
also test for EEXIST (which is returned by some OSes).
---

diff --git a/generator.c b/generator.c
index deefff4e..e46da847 100644
--- a/generator.c
+++ b/generator.c
@@ -186,7 +186,7 @@ static int delete_item(char *fname, int mode, int flags)
 	if (do_rmdir(fname) == 0) {
 		if (!(flags & DEL_TERSE))
 			log_delete(fname, mode);
-	} else if (errno != ENOTEMPTY && errno != ENOENT) {
+	} else if (errno != ENOTEMPTY && errno != EEXIST && errno != ENOENT) {
 		rsyserr(FERROR, errno, "delete_file: rmdir %s failed",
 			full_fname(fname));
 		return -1;