rpms/gvfs/devel gvfs-0.2.4-trash-automount.patch, NONE, 1.1 gvfs.spec, 1.56, 1.57

[Tomas Bzatek (tbzatek)]

Author: tbzatek

Update of /cvs/extras/rpms/gvfs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1880

Modified Files:
	gvfs.spec 
Added Files:
	gvfs-0.2.4-trash-automount.patch 
Log Message:
* Tue Jun 24 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.99.1-3
- gvfsd-trash: Skip autofs mounts


gvfs-0.2.4-trash-automount.patch:

--- NEW FILE gvfs-0.2.4-trash-automount.patch ---
--- gvfs-0.2.4-orig/daemon/gvfsbackendtrash.c	2008-05-26 17:54:32.000000000 -0400
+++ gvfs-0.2.4/daemon/gvfsbackendtrash.c	2008-06-20 11:18:45.000000000 -0400
@@ -538,6 +538,10 @@
     {
       mount = l->data;
       
+      /* Skip autofs filesystem types: the root cannot contain .Trash */
+      if (strcmp ("autofs", g_unix_mount_get_fs_type (mount)) == 0)
+        continue;
+
       topdir = g_unix_mount_get_mount_path (mount);
       topdirs = g_list_prepend (topdirs, g_strdup (topdir));
       


Index: gvfs.spec
===================================================================
RCS file: /cvs/extras/rpms/gvfs/devel/gvfs.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gvfs.spec	12 Jun 2008 09:25:23 -0000	1.56
+++ gvfs.spec	24 Jun 2008 12:26:33 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 0.99.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -40,6 +40,9 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=522933
 Patch2: gvfs-ftp-read-directory-2.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=525779
+Patch3: gvfs-0.2.4-trash-automount.patch
+
 
 %description
 The gvfs package provides backend implementations for the gio 
@@ -70,6 +73,7 @@
 %setup -q
 %patch1 -p0 -b .archive-integration
 %patch2 -p0 -b .recurse-dir
+%patch3 -p1 -b .trash
 
 %build
 
@@ -184,6 +188,9 @@
 
 
 %changelog
+* Tue Jun 24 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.99.1-3
+- gvfsd-trash: Skip autofs mounts
+
 * Thu Jun 12 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.99.1-2
 - Fix transfer of whole directories from FTP (#448560)