glib r6598 - trunk/gio

[alexl svn gnome org]

Author: alexl
Date: Wed Feb 27 11:16:58 2008
New Revision: 6598
URL: http://svn.gnome.org/viewvc/glib?rev=6598&view=rev

Log:
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)



Modified:
   trunk/gio/ChangeLog
   trunk/gio/glocalfile.c

Modified: trunk/gio/glocalfile.c
==============================================================================
--- trunk/gio/glocalfile.c	(original)
+++ trunk/gio/glocalfile.c	Wed Feb 27 11:16:58 2008
@@ -1295,6 +1295,12 @@
     {
       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"),