Merge lp:~salgado/linaro-image-tools/bug-687636 into lp:linaro-image-tools/11.11

[Guilherme Salgado]

Fix bug 687636 and bug 694047

[James Westby (james-w)]

review: Approve

=== modified file 'linaro-hwpack-install'
--- linaro-hwpack-install	2010-12-16 02:19:53 +0000
+++ linaro-hwpack-install	2011-01-06 13:02:59 +0000
@@ -137,7 +137,8 @@
 echo "deb file:${HWPACK_DIR}/pkgs ./" > "$SOURCES_LIST_FILE"
 cat /etc/apt/sources.list >> "$SOURCES_LIST_FILE"
 
-sudo apt-get -o "$APT_GET_OPTIONS" update -qq
+echo "Updating apt package lists ..."
+sudo apt-get -o "$APT_GET_OPTIONS" update -q
 
 echo -n "Installing packages ..."
 

=== modified file 'media_create/check_device.py'
--- media_create/check_device.py	2011-01-03 11:51:36 +0000
+++ media_create/check_device.py	2011-01-06 13:02:59 +0000
@@ -1,13 +1,15 @@
+import glob
 import sys
 
 import dbus
 
+from media_create import partitions
+
 
 def _get_system_bus_and_udisks_iface():
     """Return the system bus and the UDisks interface.
     
     :return: System bus and UDisks inteface tuple.
-
     """
     bus = dbus.SystemBus()
     udisks = dbus.Interface(
@@ -24,7 +26,6 @@
     :param device: Device object.
     :param path: Device path.
     :return: Device property.
-
     """
     return device.Get(
         path, prop, dbus_interface='org.freedesktop.DBus.Properties')
@@ -35,7 +36,6 @@
 
     :param path: Disk device path.
     :return: True if the device exist, else False.
-
     """
     bus, udisks = _get_system_bus_and_udisks_iface()
     try:
@@ -49,7 +49,6 @@
 
 def _print_devices():
     """Print disk devices found on the system."""
-
     bus, udisks = _get_system_bus_and_udisks_iface()
     print '%-16s %-16s %s' % ('Device', 'Mount point', 'Size')
     devices = udisks.get_dbus_method('EnumerateDevices')()
@@ -77,35 +76,42 @@
 
     :param device: Device path.
     :return: True if the user confirms the selection, else False.
-
     """
-
     resp = raw_input('Are you 100%% sure, on selecting [%s] (y/n)? ' % device)
     if resp.lower() != 'y':
         return False
     return True
 
 
-def check_device(path):
-    """Checks that a selected device exists.
-
-    If the device exist, the user is asked to confirm that this is the
-    device to use.
-
-    :param path: Device path.
+def _ensure_device_partitions_not_mounted(device):
+    """Ensure all partitions of the given device are not mounted."""
+    # Use '%s?*' as we only want the device files representing
+    # partitions and not the one representing the device itself.
+    for part in glob.glob('%s?*' % device):
+        partitions.ensure_partition_is_not_mounted(part)
+
+
+def confirm_device_selection_and_ensure_it_is_ready(device):
+    """Confirm this is the device to use and ensure it's ready.
+
+    If the device exists, the user is asked to confirm that this is the
+    device to use. Upon confirmation we ensure all partitions of the device
+    are umounted.
+
+    :param device: The path to the device.
     :return: True if the device exist and is selected, else False.
-
     """
-
-    if _does_device_exist(path):
+    if _does_device_exist(device):
         print '\nI see...'
         _print_devices()
-        return _select_device(path)
+        if _select_device(device):
+            _ensure_device_partitions_not_mounted(device)
+            return True
     else:
-        print '\nAre you sure? I do not see [%s].' % path
+        print '\nAre you sure? I do not see [%s].' % device
         print 'Here is what I see...'
         _print_devices()
-        return False
+    return False
 
 
 if __name__ == '__main__':
@@ -113,7 +119,8 @@
         print 'usage: ' + sys.argv[0] + ' <DEVICE>'
         sys.exit(2)
 
-    device_selected = check_device(sys.argv[1])
+    device_selected = confirm_device_selection_and_ensure_it_is_ready(
+        sys.argv[1])
     if device_selected:
         sys.exit(0)
     else:

=== modified file 'media_create/tests/test_media_create.py'
--- media_create/tests/test_media_create.py	2011-01-05 19:32:02 +0000
+++ media_create/tests/test_media_create.py	2011-01-06 13:02:59 +0000
@@ -1,5 +1,6 @@
 from contextlib import contextmanager
 import atexit
+import glob
 import os
 import random
 import string
@@ -656,19 +657,37 @@
         self._mock_sys_stdout()
         self._mock_print_devices()
 
+    def test_ensure_device_partitions_not_mounted(self):
+        partitions_umounted = []
+        def ensure_partition_is_not_mounted_mock(part):
+            partitions_umounted.append(part)
+        self.useFixture(MockSomethingFixture(
+            partitions, 'ensure_partition_is_not_mounted',
+            ensure_partition_is_not_mounted_mock))
+        self.useFixture(MockSomethingFixture(
+            glob, 'glob', lambda pattern: ['/dev/sdz1', '/dev/sdz2']))
+        check_device._ensure_device_partitions_not_mounted('/dev/sdz')
+        self.assertEquals(['/dev/sdz1', '/dev/sdz2'], partitions_umounted)
+
     def test_check_device_and_select(self):
         self._mock_does_device_exist_true()
         self._mock_select_device()
-        self.assertTrue(check_device.check_device(None))
+        self.assertTrue(
+            check_device.confirm_device_selection_and_ensure_it_is_ready(
+                None))
 
     def test_check_device_and_deselect(self):
         self._mock_does_device_exist_true()
         self._mock_deselect_device()
-        self.assertFalse(check_device.check_device(None))
+        self.assertFalse(
+            check_device.confirm_device_selection_and_ensure_it_is_ready(
+                None))
 
     def test_check_device_not_found(self):
         self._mock_does_device_exist_false()
-        self.assertFalse(check_device.check_device(None))
+        self.assertFalse(
+            check_device.confirm_device_selection_and_ensure_it_is_ready(
+                None))
 
 
 class AtExitRegister(object):