Handle filesystems (like ntfs-3g) that return EEXIST instead of ENOTEMPTY

2008-02-26  Alexander Larsson  <alexl@redhat.com>

        * glocalfile.c:
        (g_local_file_delete):
	Handle filesystems (like ntfs-3g) that return EEXIST instead
	of ENOTEMPTY (#518816)

svn path=/trunk/; revision=6598

diff --git a/gio/ChangeLog b/gio/ChangeLog
index 3fbe392..4dc738f 100644 (file)
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-26  Alexander Larsson  <alexl@redhat.com>
+
+        * glocalfile.c:
+        (g_local_file_delete):
+       Handle filesystems (like ntfs-3g) that return EEXIST instead
+       of ENOTEMPTY (#518816)
+
 2008-02-25  Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.15.6 ===

diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index ec15104..326685e 100644 (file)
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -1295,6 +1295,12 @@ g_local_file_delete (GFile         *file,
     {
       int errsv = errno;
 
+      /* Posix allows EEXIST too, but the more sane error
+        is G_IO_ERROR_NOT_FOUND, and its what nautilus
+        expects */
+      if (errsv == EEXIST)
+       errsv = ENOTEMPTY;
+
       g_set_error (error, G_IO_ERROR,
                   g_io_error_from_errno (errsv),
                   _("Error removing file: %s"),