[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-storage.c, 1.116, 1.117

[tss-movial at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/maildir
In directory talvi:/tmp/cvs-serv17043

Modified Files:
	maildir-storage.c 
Log Message:
With some NFS implementation DELETE failed if ..DOVECOT-TRASHED directory already existed



Index: maildir-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-storage.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- maildir-storage.c	31 May 2006 13:17:49 -0000	1.116
+++ maildir-storage.c	31 May 2006 13:20:48 -0000	1.117
@@ -666,7 +666,9 @@
 	} else {
 		count = 0;
 		while (rename(src, dest) < 0 && count < 2) {
-			if (errno != EEXIST && errno != ENOTEMPTY) {
+			/* EBUSY is given by some NFS implementations */
+			if (errno != EEXIST && errno != ENOTEMPTY &&
+			    errno != EBUSY) {
 				mail_storage_set_critical(_storage,
 					"rename(%s, %s) failed: %m", src, dest);
 				return -1;