[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-storage.c, 1.115.2.2, 1.115.2.3

[cras at dovecot.org]

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

Modified Files:
      Tag: branch_1_0
	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.115.2.2
retrieving revision 1.115.2.3
diff -u -d -r1.115.2.2 -r1.115.2.3
--- maildir-storage.c	31 May 2006 13:17:17 -0000	1.115.2.2
+++ maildir-storage.c	31 May 2006 13:21:08 -0000	1.115.2.3
@@ -678,7 +678,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;