[maemo-commits] [maemo-commits] r12044 - in projects/haf/trunk/osso-gnome-vfs2/debian: . patches

[From: subversion at stage.maemo.org]

Author: richard
Date: 2007-06-01 16:31:52 +0300 (Fri, 01 Jun 2007)
New Revision: 12044

Modified:
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
   projects/haf/trunk/osso-gnome-vfs2/debian/patches/30-allow-corrupt-drives.patch
Log:
Allow even more broken cards.


Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-06-01 13:28:03 UTC (rev 12043)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-06-01 13:31:52 UTC (rev 12044)
@@ -2,6 +2,7 @@
 
   * Use the slot_name property that HAL provides to identity the MMC cards
   * Make the daemon/client more robust against restarted daemon
+  * Also allow even more corrupt (or empty) MMC cards
 
  -- Richard Hult <richard at imendio.com>  Fri,  1 Jun 2007 14:29:53 +0200
 

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/patches/30-allow-corrupt-drives.patch
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/patches/30-allow-corrupt-drives.patch	2007-06-01 13:28:03 UTC (rev 12043)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/patches/30-allow-corrupt-drives.patch	2007-06-01 13:31:52 UTC (rev 12044)
@@ -1,10 +1,22 @@
---- libgnomevfs/gnome-vfs-hal-mounts.c-unmod	2007-05-29 18:17:17.000000000 +0200
-+++ libgnomevfs/gnome-vfs-hal-mounts.c	2007-05-29 18:17:20.000000000 +0200
-@@ -669,6 +669,7 @@ _hal_volume_policy_check (GnomeVFSVolume
+Index: libgnomevfs/gnome-vfs-hal-mounts.c
+===================================================================
+--- libgnomevfs/gnome-vfs-hal-mounts.c	(revision 11974)
++++ libgnomevfs/gnome-vfs-hal-mounts.c	(arbetskopia)
+@@ -655,6 +655,8 @@ _hal_volume_policy_check (GnomeVFSVolume
  	/* needs to be a mountable filesystem OR contain crypto bits OR audio disc OR blank disc */
  	if (! ((libhal_volume_get_fsusage (hal_volume) == LIBHAL_VOLUME_USAGE_MOUNTABLE_FILESYSTEM) ||
  	       (libhal_volume_get_fsusage (hal_volume) == LIBHAL_VOLUME_USAGE_CRYPTO) ||
++	       /* added in maemo to allow drives for unformatted cards: */
 +	       (libhal_volume_get_fsusage (hal_volume) == LIBHAL_VOLUME_USAGE_UNKNOWN) ||
  	       libhal_volume_disc_has_audio (hal_volume) ||
  	       libhal_volume_disc_is_blank (hal_volume)))
  		goto out;
+@@ -825,7 +827,7 @@ _hal_add_drive_without_volumes (GnomeVFS
+ 
+ 	/* doesn't make sense for devices without removable storage */
+ 	if (!libhal_drive_uses_removable_media (hal_drive)) {
+-		goto out;
++		/*goto out; Patched out from maemo to allow drives for unformatted cards */
+ 	}
+ 	
+  	dbus_error_init (&error);