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

Tomas Bzatek (tbzatek) fedora-extras-commits at redhat.com
Tue Jun 24 11:57:31 UTC 2008


Author: tbzatek

Update of /cvs/extras/rpms/gvfs/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26171

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.2.4-5
- 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/F-9/gvfs.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- gvfs.spec	11 Jun 2008 08:52:06 -0000	1.56
+++ gvfs.spec	24 Jun 2008 11:56:46 -0000	1.57
@@ -1,7 +1,7 @@
 Summary: Backends for the gio framework in GLib
 Name: gvfs
 Version: 0.2.4
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://www.gtk.org
@@ -47,6 +47,8 @@
 # http://bugzilla.gnome.org/show_bug.cgi?id=522933
 Patch6: gvfs-ftp-read-directory-2.patch
 
+# http://bugzilla.gnome.org/show_bug.cgi?id=525779
+Patch7: gvfs-0.2.4-trash-automount.patch
 
 %description
 The gvfs package provides backend implementations for the gio 
@@ -81,6 +83,7 @@
 %patch4 -p1 -b .debug
 %patch5 -p0 -b .obexftp
 %patch6 -p0 -b .recurse
+%patch7 -p1 -b .trash
 
 
 %build
@@ -196,6 +199,9 @@
 
 
 %changelog
+* Tue Jun 24 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.2.4-5
+- gvfsd-trash: Skip autofs mounts
+
 * Tue Jun 10 2008 Tomas Bzatek <tbzatek at redhat.com> - 0.2.4-4
 - Minor fixes to the last FTP patch
 




More information about the fedora-extras-commits mailing list