r36614 - in /desktop/unstable/gvfs/debian: changelog patches/06_metadata_nfs.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Tue Feb  5 13:02:18 2013
New Revision: 36614

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36614
Log:
06_metadata_nfs.patch: new patch. Disable gvfsd-metadata entirely on 
remote filesystems. It is better to miss functionality than to 
hammer the server. Closes: #624507.

Added:
    desktop/unstable/gvfs/debian/patches/06_metadata_nfs.patch
Modified:
    desktop/unstable/gvfs/debian/changelog
    desktop/unstable/gvfs/debian/patches/series

Modified: desktop/unstable/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/changelog?rev=36614&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gvfs/debian/changelog [utf-8] Tue Feb  5 13:02:18 2013
@@ -1,3 +1,11 @@
+gvfs (1.12.3-4) unstable; urgency=low
+
+  * 06_metadata_nfs.patch: new patch. Disable gvfsd-metadata entirely on 
+    remote filesystems. It is better to miss functionality than to 
+    hammer the server. Closes: #624507.
+
+ -- Josselin Mouette <joss at debian.org>  Tue, 05 Feb 2013 14:02:04 +0100
+
 gvfs (1.12.3-3) unstable; urgency=low
 
   * Add dependency on desktop-file-utils since many operations won’t 

Added: desktop/unstable/gvfs/debian/patches/06_metadata_nfs.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/06_metadata_nfs.patch?rev=36614&op=file
==============================================================================
--- desktop/unstable/gvfs/debian/patches/06_metadata_nfs.patch (added)
+++ desktop/unstable/gvfs/debian/patches/06_metadata_nfs.patch [utf-8] Tue Feb  5 13:02:18 2013
@@ -1,0 +1,55 @@
+Index: gvfs-1.12.3/metadata/meta-daemon.c
+===================================================================
+--- gvfs-1.12.3.orig/metadata/meta-daemon.c	2013-02-05 12:47:16.644043661 +0100
++++ gvfs-1.12.3/metadata/meta-daemon.c	2013-02-05 13:51:38.558923599 +0100
+@@ -25,6 +25,7 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ #include <glib/gstdio.h>
++#include <gio/gio.h>
+ #include <locale.h>
+ #include <stdlib.h>
+ #include <dbus/dbus.h>
+@@ -681,6 +682,29 @@ static struct DBusObjectPathVTable metad
+   metadata_message
+ };
+ 
++static gboolean
++home_is_remote (void)
++{
++  GFile *homedir = g_file_new_for_path (g_get_home_dir ());
++  GFileInfo *info = g_file_query_filesystem_info (homedir,
++                                                  G_FILE_ATTRIBUTE_FILESYSTEM_TYPE,
++                                                  NULL, NULL);
++  gboolean retval = FALSE;
++
++  if (info)
++    {
++      const char *fstype = g_file_info_get_attribute_string (info,
++                                                             G_FILE_ATTRIBUTE_FILESYSTEM_TYPE);
++      if (fstype && (g_str_has_prefix (fstype, "nfs") ||
++                     g_str_has_prefix (fstype, "smb") ||
++                     g_str_equal (fstype, "cifs")))
++        retval = TRUE;
++      g_object_unref (info);
++    }
++  g_object_unref (homedir);
++  return retval;
++}
++
+ int
+ main (int argc, char *argv[])
+ {
+@@ -729,6 +753,12 @@ main (int argc, char *argv[])
+ 
+   g_type_init ();
+ 
++  if (home_is_remote ())
++    {
++      g_printerr ("Remote filesystem detected, shutting down.\n");
++      return 1;
++    }
++
+   loop = g_main_loop_new (NULL, FALSE);
+ 
+   dbus_error_init (&derror);

Modified: desktop/unstable/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gvfs/debian/patches/series?rev=36614&op=diff
==============================================================================
--- desktop/unstable/gvfs/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gvfs/debian/patches/series [utf-8] Tue Feb  5 13:02:18 2013
@@ -3,3 +3,4 @@
 03_xdg-mount.patch
 04_hurd_path_max.patch
 05_shared_libdaemon.patch
+06_metadata_nfs.patch