[maemo-commits] [maemo-commits] r18342 - in projects/haf/trunk/ke-recv: debian src

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-05-13 09:11:41 +0300 (Wed, 13 May 2009)
New Revision: 18342

Modified:
   projects/haf/trunk/ke-recv/debian/changelog
   projects/haf/trunk/ke-recv/src/events.c
Log:

  * Do not lose mount point info when card was mounted read-only.
  * Fixes: NB#114816 - Error banner is displayed and henceforth memory card in
    not formatted when trying to format memory card

--T

M    debian/changelog
M    src/events.c


Modified: projects/haf/trunk/ke-recv/debian/changelog
===================================================================
--- projects/haf/trunk/ke-recv/debian/changelog	2009-05-12 17:06:03 UTC (rev 18341)
+++ projects/haf/trunk/ke-recv/debian/changelog	2009-05-13 06:11:41 UTC (rev 18342)
@@ -2,6 +2,9 @@
 
   * Do not log bogus error 'MP is not writable' in the external card mounting
     case.
+  * Do not lose mount point info when card was mounted read-only.
+  * Fixes: NB#114816 - Error banner is displayed and henceforth memory card in
+    not formatted when trying to format memory card
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Tue, 12 May 2009 14:13:06 +0300
 

Modified: projects/haf/trunk/ke-recv/src/events.c
===================================================================
--- projects/haf/trunk/ke-recv/src/events.c	2009-05-12 17:06:03 UTC (rev 18341)
+++ projects/haf/trunk/ke-recv/src/events.c	2009-05-13 06:11:41 UTC (rev 18342)
@@ -946,15 +946,19 @@
                 set_mmc_corrupted_flag(FALSE, mmc);
                 count = 1;
         } else if (ret == 2) {
+                /* is was mounted read-only */
                 ULOG_DEBUG_F("exec_prog returned %d", ret);
-                l->corrupt = 1; /* 10s check failed */
+                l->mountpoint = strdup(mmc->mount_point);
+                l->corrupt = 1;
                 inform_mmc_swapping(FALSE, mmc);
                 set_mmc_corrupted_flag(TRUE, mmc);
                 if (show_errors)
                         open_closeable_dialog(OSSO_GN_NOTICE,
                                 _("card_ia_corrupted"), "OMG!");
         } else {
+                /* corrupt beyond mounting, or unsupported format */
                 ULOG_DEBUG_F("exec_prog returned %d", ret);
+                l->mountpoint = NULL;
                 l->corrupt = 1;
                 inform_mmc_swapping(FALSE, mmc);
                 set_mmc_corrupted_flag(TRUE, mmc);