r36110 - in /desktop/experimental/gvfs/debian: changelog patches/metadata-dont-flush-null-tree.patch patches/series

[smcv at users.alioth.debian.org]

Author: smcv
Date: Tue Oct 23 08:50:54 2012
New Revision: 36110

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36110
Log:
Add patch from Christian Kellner, via Ubuntu, to not try to flush a
tree that doesn't exist (LP: #405432)

Added:
    desktop/experimental/gvfs/debian/patches/metadata-dont-flush-null-tree.patch
Modified:
    desktop/experimental/gvfs/debian/changelog
    desktop/experimental/gvfs/debian/patches/series

Modified: desktop/experimental/gvfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/changelog?rev=36110&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/changelog [utf-8] (original)
+++ desktop/experimental/gvfs/debian/changelog [utf-8] Tue Oct 23 08:50:54 2012
@@ -17,6 +17,8 @@
     - add patch from Ubuntu to not crash when creating volume monitors if the
       VFS never initialized (LP: #832533)
     - add patch from Ubuntu to keep a ref to jobs while they run in a thread
+    - Add patch from Christian Kellner, via Ubuntu, to not try to flush a
+      tree that doesn't exist (LP: #405432)
 
  -- Simon McVittie <smcv at debian.org>  Tue, 23 Oct 2012 09:21:04 +0100
 

Added: desktop/experimental/gvfs/debian/patches/metadata-dont-flush-null-tree.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/metadata-dont-flush-null-tree.patch?rev=36110&op=file
==============================================================================
--- desktop/experimental/gvfs/debian/patches/metadata-dont-flush-null-tree.patch (added)
+++ desktop/experimental/gvfs/debian/patches/metadata-dont-flush-null-tree.patch [utf-8] Tue Oct 23 08:50:54 2012
@@ -1,0 +1,34 @@
+From 6c3ca864314a87c65e245db853fc0dae3649341b Mon Sep 17 00:00:00 2001
+From: Christian Kellner <gicmo at gnome.org>
+Date: Wed, 4 Nov 2009 14:20:59 +0100
+Subject: [PATCH] Check if MetaTree exists before flushing it
+
+Also change meta_tree_clear () so it sets fd to -1; this will make
+meta_tree_exists () work as expected. Bug 598561.
+---
+ metadata/metatree.c |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+Index: gvfs-1.12.0/metadata/metatree.c
+===================================================================
+--- gvfs-1.12.0.orig/metadata/metatree.c	2012-03-26 10:35:11.000000000 -0400
++++ gvfs-1.12.0/metadata/metatree.c	2012-04-11 11:22:44.483902765 -0400
+@@ -272,7 +272,7 @@
+   if (tree->fd != -1)
+     {
+       close (tree->fd);
+-      tree->fd = 0;
++      tree->fd = -1;
+     }
+ }
+ 
+@@ -2351,6 +2351,9 @@
+ 
+   builder = meta_builder_new ();
+ 
++  if (!meta_tree_exists (tree))
++    return FALSE;
++
+   copy_tree_to_builder (tree, tree->root, builder->root);
+ 
+   if (tree->journal)

Modified: desktop/experimental/gvfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gvfs/debian/patches/series?rev=36110&op=diff
==============================================================================
--- desktop/experimental/gvfs/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gvfs/debian/patches/series [utf-8] Tue Oct 23 08:50:54 2012
@@ -2,6 +2,7 @@
 03_xdg-mount.patch
 04_hurd_path_max.patch
 05_shared_libdaemon.patch
+metadata-dont-flush-null-tree.patch
 dont-crash-on-null-job.patch
 handle-inactive-vfs.patch
 ref-jobs-in-thread.patch