luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-27 22:46:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Return G_IO_ERROR_IS_DIRECTORY, not G_IO_ERROR_WOULD_MERGE when moving

Browse Source 
2008-03-27  Alexander Larsson  <alexl@redhat.com>

	* glocalfile.c (g_local_file_move):
	Return G_IO_ERROR_IS_DIRECTORY, not G_IO_ERROR_WOULD_MERGE when moving
	file over directory. This is according to the docs and what the move via
	copy+remove fallback does.



svn path=/trunk/; revision=6758
This commit is contained in:
Alexander Larsson 2008-03-27 20:13:00 +00:00 committed by Alexander Larsson
parent d7d4211cb0
commit 9dfce3a26a
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gio/ChangeLog
View File

@ -1,3 +1,10 @@
2008-03-27 Alexander Larsson <alexl@redhat.com>
* glocalfile.c (g_local_file_move):
Return G_IO_ERROR_IS_DIRECTORY, not G_IO_ERROR_WOULD_MERGE when moving
file over directory. This is according to the docs and what the move via
copy+remove fallback does.
2008-03-27 Lin Ma <Lin.Ma@Sun.COM> 2008-03-27 Lin Ma <Lin.Ma@Sun.COM>
* fen/*.[hc]: Updated copyright. * fen/*.[hc]: Updated copyright.

9
gio/glocalfile.c
View File

@ -2078,9 +2078,8 @@ g_local_file_move (GFile *source,
g_strerror (errsv)); g_strerror (errsv));
return FALSE; return FALSE;
} }
else
source_is_dir = S_ISDIR (statbuf.st_mode);
source_is_dir = S_ISDIR (statbuf.st_mode);
source_size = statbuf.st_size; source_size = statbuf.st_size;
destination_exist = FALSE; destination_exist = FALSE;
@ -2094,10 +2093,16 @@ g_local_file_move (GFile *source,
/* Always fail on dirs, even with overwrite */ /* Always fail on dirs, even with overwrite */
if (S_ISDIR (statbuf.st_mode)) if (S_ISDIR (statbuf.st_mode))
{ {
if (source_is_dir)
g_set_error (error, g_set_error (error,
G_IO_ERROR, G_IO_ERROR,
G_IO_ERROR_WOULD_MERGE, G_IO_ERROR_WOULD_MERGE,
_("Can't move directory over directory")); _("Can't move directory over directory"));
else
g_set_error (error,
G_IO_ERROR,
G_IO_ERROR_IS_DIRECTORY,
_("File is directory"));
return FALSE; return FALSE;
} }
} }