[Pkg-utopia-commits] r98 - in packages/gnome-volume-manager/trunk/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2004-11-18 07:29:25 -0700 (Thu, 18 Nov 2004)
New Revision: 98

Added:
   packages/gnome-volume-manager/trunk/debian/patches/25_ignore_empty_fsusage.patch
Modified:
   packages/gnome-volume-manager/trunk/debian/changelog
Log:
If hal couldn't determine the volume.fsusage property, assume it's a filesystem



Modified: packages/gnome-volume-manager/trunk/debian/changelog
===================================================================
--- packages/gnome-volume-manager/trunk/debian/changelog	2004-11-18 14:24:35 UTC (rev 97)
+++ packages/gnome-volume-manager/trunk/debian/changelog	2004-11-18 14:29:25 UTC (rev 98)
@@ -26,6 +26,9 @@
   * Use pmount-hal and pumount as commands for mounting and unmounting.
   * debian/patches/02_search_fstab.patch
     + Removed. pmount searches fstab now, so we don't have too.
+  * debian/patches/25_ignore_empty_fsusage.patch
+    + Added. When hal couldn't determine the filesystem usage, assume it's a
+    filesystem.
 
  -- Sjoerd Simons <sjoerd@debian.org>  Wed, 17 Nov 2004 11:44:57 +0100
 

Added: packages/gnome-volume-manager/trunk/debian/patches/25_ignore_empty_fsusage.patch
===================================================================
--- packages/gnome-volume-manager/trunk/debian/patches/25_ignore_empty_fsusage.patch	2004-11-18 14:24:35 UTC (rev 97)
+++ packages/gnome-volume-manager/trunk/debian/patches/25_ignore_empty_fsusage.patch	2004-11-18 14:29:25 UTC (rev 98)
@@ -0,0 +1,17 @@
+diff -ruN gnome-volume-manager-old/src/manager.c gnome-volume-manager/src/manager.c
+--- gnome-volume-manager-old/src/manager.c	2004-11-18 15:18:47.437344000 +0100
++++ gnome-volume-manager/src/manager.c	2004-11-18 15:21:59.411942343 +0100
+@@ -1057,9 +1057,10 @@
+ 		/* only mount if the block device got a sensible filesystem */
+ 		if (!hal_device_property_exists (ctx, udi, 
+ 						"volume.fsusage") ||
+-		    strcmp (hal_device_get_property_string (ctx, udi, 
+-							    "volume.fsusage"), 
+-			    "filesystem") != 0)
++		    (strcmp (hal_device_get_property_string (ctx, udi, 
++							    "volume.fsusage"), "filesystem") != 0 
++         && strcmp (hal_device_get_property_string (ctx, udi,
++                               "volume.fsusage"), "") != 0))
+ 			continue;
+     /* only automagically mount when manual_mount is not specified */
+ 		if (gvm_is_manual_mount(ctx, udi))