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

[From: subversion at stage.maemo.org]

Author: kihamala
Date: 2009-07-22 15:04:11 +0300 (Wed, 22 Jul 2009)
New Revision: 18948

Modified:
   projects/haf/trunk/ke-recv/debian/changelog
   projects/haf/trunk/ke-recv/src/events.c
   projects/haf/trunk/ke-recv/src/osso-mmc-umount.sh
Log:
fix for 127339


Modified: projects/haf/trunk/ke-recv/debian/changelog
===================================================================
--- projects/haf/trunk/ke-recv/debian/changelog	2009-07-22 11:15:34 UTC (rev 18947)
+++ projects/haf/trunk/ke-recv/debian/changelog	2009-07-22 12:04:11 UTC (rev 18948)
@@ -15,6 +15,8 @@
     storage mode
   * Fixes: NB#128388 - vfat should sit at the first partition
   * Fixes: NB#123352 - AppCert-USB-Modem query doesn't work after PC reboot
+  * Fixes: NB#127339 - AppCert-ke-recv doesn't export card if the partition
+    format isn't recognized
 
  -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Wed, 15 Jul 2009 13:02:48 +0300
 

Modified: projects/haf/trunk/ke-recv/src/events.c
===================================================================
--- projects/haf/trunk/ke-recv/src/events.c	2009-07-22 11:15:34 UTC (rev 18947)
+++ projects/haf/trunk/ke-recv/src/events.c	2009-07-22 12:04:11 UTC (rev 18948)
@@ -1086,11 +1086,20 @@
                                    mmc->preferred_volume);
                         all_unmounted = 0;
                 } else {
-                        if (vol->mountpoint &&
-                            do_unmount(vol->mountpoint, lazy)) {
-                                ULOG_DEBUG_F("unmounted %s", vol->udi);
+                        char *arg;
+                        if (vol->mountpoint)
+                                arg = vol->mountpoint;
+                        else
+                                /* use device name in case it is not mounted
+                                 * or mount point could be unknown */
+                                arg = vol->dev_name;
+
+                        if (do_unmount(arg, lazy)) {
+                                ULOG_DEBUG_F("unmounted %s (%s)", arg,
+                                             vol->udi);
                         } else {
-                                ULOG_INFO_F("couldn't unmount %s", vol->udi);
+                                ULOG_INFO_F("couldn't unmount %s (%s)", arg,
+                                            vol->udi);
                                 all_unmounted = 0;
                         }
                 }

Modified: projects/haf/trunk/ke-recv/src/osso-mmc-umount.sh
===================================================================
--- projects/haf/trunk/ke-recv/src/osso-mmc-umount.sh	2009-07-22 11:15:34 UTC (rev 18947)
+++ projects/haf/trunk/ke-recv/src/osso-mmc-umount.sh	2009-07-22 12:04:11 UTC (rev 18948)
@@ -20,7 +20,7 @@
 # 02110-1301 USA
 
 if [ $# -lt 1 ]; then
-  echo "Usage: $0 <mount point> [\"lazy\"]"
+  echo "Usage: $0 <mount point | device> [\"lazy\"]"
   exit 1
 fi