Merge lp:~mbp/usb-creator/477529-cruzer into lp:usb-creator

[Martin Pool]

[Martin Pool (mbp)]

This fixes two things related to bug 477529:

* if the source image is not an Ubuntu image (does not contain syslinux) you get a better clue
* when you add a new source to the source list, it is selected in the list

[Martin Pool (mbp)]

This doesn't fix it in the case where you use --iso

[Martin Pool (mbp)]

this new revision at least leaves the sources visible so you can see the wrong one is selected

[lp:~mbp/usb-creator/477529-cruzer]

263. By Martin Pool on 2010-01-30

Still show source vbox if --iso is given

[Evan (ev)]

Merged.

review: Approve

=== modified file 'TODO'
--- TODO	2009-09-18 14:54:43 +0000
+++ TODO	2010-01-30 18:31:13 +0000
@@ -3,8 +3,6 @@
  * Find out why resume from cancel install hangs the creator
  * Implement icons in treeview similar to gtk frontend (warning, etc)
    - need gio and get_gnome_drive equivalent functions from commit 205
- * When adding a new source via "Other" make it selected/default
-   - does not currently do this and is annoying and confusing
 
 TODO for usb-creator-win:
 -------------------------

=== modified file 'usbcreator/frontends/gtk/frontend.py'
--- usbcreator/frontends/gtk/frontend.py	2010-01-21 22:28:23 +0000
+++ usbcreator/frontends/gtk/frontend.py	2010-01-30 18:31:13 +0000
@@ -129,8 +129,11 @@
 
         # Pre-populate the source view.
         if img is not None:
+            # XXX: this doesn't make it selected by default, and it should.
+            # It's a bit hard because other sources are asynchronously added
+            # later by the backend? --
+            # mbp 2010-01-30.  
             self.backend.add_image(img)
-            self.source_vbox.hide()
 
         if not persistent:
             self.persist_disabled.set_active(True)
@@ -176,8 +179,8 @@
 
     def add_source(self, source):
         logging.debug('add_source: %s' % str(source))
-        model = self.source_treeview.get_model()
-        model.append([source])
+        _append_to_list_and_select(self.source_treeview, [source],
+            force_selection=True)
         
         # XXX evand 2009-09-17: Find a label and icon for the device, if we
         # don't already have one.  This will go away when the code for the
@@ -193,16 +196,10 @@
             if not l and name:
                 self.names[source] = name
 
-        # Select the device in the treeview.
-        sel = self.source_treeview.get_selection()
-        m, i = sel.get_selected()
-        if not i:
-            sel.select_path(0)
-    
     def add_target(self, target):
         logging.debug('add_target: %s' % str(target))
-        model = self.dest_treeview.get_model()
-        model.append([target])
+        _append_to_list_and_select(self.dest_treeview, [target],
+            force_selection=False)
 
         # XXX evand 2009-09-17: Find a label and icon for the device.
         d = self.backend.targets[target]['device']
@@ -213,12 +210,6 @@
         if not l and name:
             self.names[target] = name
 
-        # Select the device in the treeview.
-        sel = self.dest_treeview.get_selection()
-        m, i = sel.get_selected()
-        if not i:
-            sel.select_path(0)
-
     def remove_source(self, source):
         model = self.source_treeview.get_model()
         iterator = model.get_iter_first()
@@ -681,4 +672,10 @@
         if dir:
             subprocess.Popen(['gnome-open', dir])
 
+def _append_to_list_and_select(treeview, new_row, force_selection):
+    model = treeview.get_model()
+    new_iter = model.append(new_row)
+    if force_selection or (treeview.get_selection().get_selected()[1] is None):
+        treeview.set_cursor(model.get_path(new_iter))
+
 # vim: set ai et sts=4 tabstop=4 sw=4:

=== modified file 'usbcreator/install.py'
--- usbcreator/install.py	2009-10-26 17:05:17 +0000
+++ usbcreator/install.py	2010-01-30 18:31:13 +0000
@@ -216,11 +216,19 @@
     def mangle_syslinux(self):
         logging.debug('mangle_syslinux')
         self.progress_message(_('Modifying configuration...'))
-        # Syslinux expects syslinux/syslinux.cfg.
-        os.renames(os.path.join(self.target, 'isolinux'),
-                   os.path.join(self.target, 'syslinux'))
-        os.renames(os.path.join(self.target, 'syslinux', 'isolinux.cfg'),
-                   os.path.join(self.target, 'syslinux', 'syslinux.cfg'))
+        try:
+            # Syslinux expects syslinux/syslinux.cfg.
+            os.renames(os.path.join(self.target, 'isolinux'),
+                    os.path.join(self.target, 'syslinux'))
+            os.renames(os.path.join(self.target, 'syslinux', 'isolinux.cfg'),
+                    os.path.join(self.target, 'syslinux', 'syslinux.cfg'))
+        except (OSError, IOError), e:
+            # Failure here probably means the source was not really an Ubuntu
+            # image and did not have the files we wanted to move, see
+            # <https://bugs.launchpad.net/launchpad-code/+bug/513432>
+            self._failure(_('Could not move syslinux files in "%s": %s. '
+                'Maybe "%s" is not an Ubuntu image?') %
+                (self.target, e, self.source))
         self.check()
         
         # Mangle the configuration files based on the options we've selected.