[maemo-commits] [maemo-commits] r19096 - in projects/haf/tags/ke-recv/3.19-3.1: debian mmc-utils src

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Mon Aug 10 16:32:43 EEST 2009 
Author: kihamala
Date: 2009-08-10 16:32:26 +0300 (Mon, 10 Aug 2009)
New Revision: 19096

Modified:
   projects/haf/tags/ke-recv/3.19-3.1/debian/changelog
   projects/haf/tags/ke-recv/3.19-3.1/mmc-utils/mmc-pre-unmount.c
   projects/haf/tags/ke-recv/3.19-3.1/src/events.c
   projects/haf/tags/ke-recv/3.19-3.1/src/osso-mmc-mount.sh
Log:
fixed "issues"


Modified: projects/haf/tags/ke-recv/3.19-3.1/debian/changelog
===================================================================
--- projects/haf/tags/ke-recv/3.19-3.1/debian/changelog	2009-08-10 12:34:03 UTC (rev 19095)
+++ projects/haf/tags/ke-recv/3.19-3.1/debian/changelog	2009-08-10 13:32:26 UTC (rev 19096)
@@ -1,3 +1,15 @@
+ke-recv (3.19-3.1) unstable; urgency=low
+
+  * Remove backwards compatibility code for the old eMMC layout:
+  * Fixes: NB#127339 - AppCert-ke-recv doesn't export card if the partition
+    format isn't recognized
+  * Fixes: NB#114280 - MyDocs gets dated Jan 1 1970 after using USB in mass
+    storage mode
+  * Fixes: NB#121472 - mmc-pre-unmount crashes on mass storage mode when
+    memory is full
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Mon, 10 Aug 2009 15:58:01 +0300
+
 ke-recv (3.19-3) unstable; urgency=low
 
   * Changes to support the new partition layout.

Modified: projects/haf/tags/ke-recv/3.19-3.1/mmc-utils/mmc-pre-unmount.c
===================================================================
--- projects/haf/tags/ke-recv/3.19-3.1/mmc-utils/mmc-pre-unmount.c	2009-08-10 12:34:03 UTC (rev 19095)
+++ projects/haf/tags/ke-recv/3.19-3.1/mmc-utils/mmc-pre-unmount.c	2009-08-10 13:32:26 UTC (rev 19096)
@@ -64,6 +64,9 @@
         GList *l;
 
 	monitor = gnome_vfs_get_volume_monitor ();
+        if (monitor == NULL)
+                return 0;
+
         l = gnome_vfs_volume_monitor_get_mounted_volumes (monitor);
         for (; l != NULL; l = l->next) {
                 GnomeVFSVolume *v;

Modified: projects/haf/tags/ke-recv/3.19-3.1/src/events.c
===================================================================
--- projects/haf/tags/ke-recv/3.19-3.1/src/events.c	2009-08-10 12:34:03 UTC (rev 19095)
+++ projects/haf/tags/ke-recv/3.19-3.1/src/events.c	2009-08-10 13:32:26 UTC (rev 19096)
@@ -104,19 +104,13 @@
 {
         volume_list_t *vol;
         vol = get_nth_volume(mmc, mmc->preferred_volume);
-        if (vol && vol->dev_name && vol->fstype
-            && strcmp(vol->fstype, "vfat")) {
-                /* workaround for not yet partitioned systems */
-                ULOG_DEBUG_F("falling back to partition 3!");
-                vol = get_nth_volume(mmc, 3);
-                if (vol == NULL || vol->dev_name == NULL)
-                        return NULL;
-        } else if (vol == NULL || vol->dev_name == NULL) {
+        if (vol && vol->dev_name) {
+                return vol;
+        } else {
                 ULOG_ERR_F("could not find partition number %d",
                            mmc->preferred_volume);
                 return NULL;
         }
-        return vol;
 }
 
 #define UPDATE_MMC_LABEL_SCRIPT "/usr/sbin/osso-update-mmc-label.sh"
@@ -890,7 +884,7 @@
 static int mount_volumes(mmc_info_t *mmc, gboolean show_errors)
 {
         const char *mount_args[] = {MMC_MOUNT_COMMAND, NULL, NULL, NULL};
-        volume_list_t *l, *l_on_first_try = NULL;
+        volume_list_t *l;
         const char *udi = NULL, *device = NULL;
         int ret, count = 0;
        
@@ -901,7 +895,6 @@
                 return 0;
         }
 
-try_again:
         udi = l->udi;
         device = l->dev_name;
 
@@ -916,13 +909,6 @@
                 possibly_turn_swap_on(mmc);
                 set_mmc_corrupted_flag(FALSE, mmc);
                 count = 1;
-                if (mmc->internal_card && l_on_first_try) {
-                        /* fallback partition was mounted, mark the
-                         * preferred one as 'swap' to counter a HAL bug
-                         * where it reports the swap partition as 'vfat' */
-                        free(l_on_first_try->fstype);
-                        l_on_first_try->fstype = strdup("swap");
-                }
         } else if (ret == 2) {
                 /* is was mounted read-only */
                 ULOG_DEBUG_F("exec_prog returned %d", ret);
@@ -930,31 +916,9 @@
                 l->corrupt = 1;
                 inform_mmc_swapping(FALSE, mmc);
                 set_mmc_corrupted_flag(TRUE, mmc);
-                if (mmc->internal_card && l_on_first_try) {
-                        /* fallback partition was mounted, mark the
-                         * preferred one as 'swap' to counter a HAL bug
-                         * where it reports the swap partition as 'vfat' */
-                        free(l_on_first_try->fstype);
-                        l_on_first_try->fstype = strdup("swap");
-                }
         } else {
                 /* corrupt beyond mounting, or unsupported format */
                 ULOG_DEBUG_F("exec_prog returned %d", ret);
-
-                if (!l_on_first_try && l->volume_number == 1 &&
-                    mmc->internal_card) {
-                        /* try partition 3 for not yet partitioned systems */
-                        ULOG_DEBUG_F("falling back to partition 3");
-                        l_on_first_try = l;
-                        l = get_nth_volume(mmc, 3);
-                        if (l == NULL || l->udi == NULL || l->dev_name == NULL)
-                                l = l_on_first_try;
-                        else
-                                goto try_again;
-                } else if (l_on_first_try)
-                        /* the partition on first try was just corrupt */
-                        l = l_on_first_try;
-
                 l->mountpoint = NULL;
                 l->corrupt = 1;
                 inform_mmc_swapping(FALSE, mmc);

Modified: projects/haf/tags/ke-recv/3.19-3.1/src/osso-mmc-mount.sh
===================================================================
--- projects/haf/tags/ke-recv/3.19-3.1/src/osso-mmc-mount.sh	2009-08-10 12:34:03 UTC (rev 19095)
+++ projects/haf/tags/ke-recv/3.19-3.1/src/osso-mmc-mount.sh	2009-08-10 13:32:26 UTC (rev 19096)
@@ -77,6 +77,7 @@
     for d in .sounds .videos .documents .images .camera; do
       mkdir -p $MP/$d
     done
+    touch $MP
   elif [ "x$MP" = "x/home/user/MyDocs" ]; then
     logger "$0: '$MP' is not writable"
   fi
More information about the maemo-commits mailing list