From bf43b5154ebde88375f9e134260a0981257875f1 Mon Sep 17 00:00:00 2001 From: Tomas Bzatek Date: Tue, 24 Jun 2008 12:26:33 +0000 Subject: [PATCH] - gvfsd-trash: Skip autofs mounts --- gvfs-0.2.4-trash-automount.patch | 13 +++++++++++++ gvfs.spec | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gvfs-0.2.4-trash-automount.patch diff --git a/gvfs-0.2.4-trash-automount.patch b/gvfs-0.2.4-trash-automount.patch new file mode 100644 index 0000000..da97d9e --- /dev/null +++ b/gvfs-0.2.4-trash-automount.patch @@ -0,0 +1,13 @@ +--- 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)); + diff --git a/gvfs.spec b/gvfs.spec index 6b04fb5..89ef9b9 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -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 @@ Patch1: gvfs-0.2.2-archive-integration.patch # 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 @@ to access the gvfs filesystems. %setup -q %patch1 -p0 -b .archive-integration %patch2 -p0 -b .recurse-dir +%patch3 -p1 -b .trash %build @@ -184,6 +188,9 @@ update-desktop-database &> /dev/null ||: %changelog +* Tue Jun 24 2008 Tomas Bzatek - 0.99.1-3 +- gvfsd-trash: Skip autofs mounts + * Thu Jun 12 2008 Tomas Bzatek - 0.99.1-2 - Fix transfer of whole directories from FTP (#448560)