Merge lp:~xnox/ubiquity/r-proposed into lp:ubiquity

[Dimitri John Ledkov]

I'm planning to land this today, if there are no objections.

[Colin Watson (cjwatson)]

Looks OK to me. Thanks!

review: Approve

=== modified file 'bin/oem-config-firstboot'
--- bin/oem-config-firstboot	2012-03-21 20:39:21 +0000
+++ bin/oem-config-firstboot	2012-11-26 13:11:19 +0000
@@ -35,14 +35,6 @@
 # Remove the oem-config-prepare menu item.
 rm -f /usr/share/applications/oem-config-prepare-gtk.desktop \
       /usr/share/applications/kde4/oem-config-prepare-kde.desktop
-# Adjust fontconfig configuration, if possible.
-if type fontconfig-voodoo >/dev/null 2>&1; then
-	RET="$(echo GET debian-installer/locale | debconf-communicate)"
-	if [ "${RET%% *}" = 0 ]; then
-		LC_ALL="${RET#* }" fontconfig-voodoo --auto --force --quiet \
-			|| true
-	fi
-fi
 # Run a command just before starting oem-config.
 RET="$(echo GET oem-config/early_command | debconf-communicate)" || true
 if [ "${RET%% *}" = 0 ]; then

=== modified file 'debian/changelog'
--- debian/changelog	2012-11-22 16:27:21 +0000
+++ debian/changelog	2012-11-26 13:11:19 +0000
@@ -1,7 +1,19 @@
 ubiquity (2.13.4) UNRELEASED; urgency=low
 
+  [ Colin Watson ]
   * Huge pile of minor changes to make ubiquity compatible with pep8 1.3.
 
+  [ Dmitrijs Ledkovs ]
+  * Clear "Read release notes or update the installer" if neither action
+    are possible. (LP: #1066302)
+  * If there is only one disk & use_device recipe is used, change next step
+    button to "Install Now". (LP: #1050044)
+  * When auto-partitioning is not possible, allow to manually partition
+    the same drive installation medium is on. (LP: #1053030)
+  * Fix the question_dialog height-for-width (LP: #862270)
+  * Fonconfig-voodoo is gone, not sure if some other "fontconfig"ury
+    should be called instead. (LP: #1043031)
+
  -- Colin Watson <[e-mail]>  Thu, 22 Nov 2012 16:25:28 +0000
 
 ubiquity (2.13.3) raring; urgency=low

=== modified file 'gui/gtk/ubiquity.ui'
--- gui/gtk/ubiquity.ui	2012-09-08 11:14:48 +0000
+++ gui/gtk/ubiquity.ui	2012-11-26 13:11:19 +0000
@@ -5,7 +5,6 @@
     <property name="can_focus">False</property>
     <child>
       <object class="GtkMenuItem" id="a11y_high_contrast">
-        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes">_High Contrast</property>
@@ -16,7 +15,6 @@
     </child>
     <child>
       <object class="GtkMenuItem" id="a11y_screen_reader">
-        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes">_Screen Reader</property>
@@ -27,7 +25,6 @@
     </child>
     <child>
       <object class="GtkMenuItem" id="a11y_keyboard_modifiers">
-        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes">_Keyboard Modifiers</property>
@@ -37,7 +34,6 @@
     </child>
     <child>
       <object class="GtkMenuItem" id="a11y_onscreen_keyboard">
-        <property name="use_action_appearance">False</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="label" translatable="yes">_On-screen Keyboard</property>
@@ -72,11 +68,9 @@
             <child>
               <object class="GtkButton" id="grub_fail_okbutton">
                 <property name="label">gtk-ok</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">True</property>
               </object>
@@ -176,11 +170,9 @@
                             <child>
                               <object class="GtkRadioButton" id="grub_new_device">
                                 <property name="label" translatable="yes">Choose a different device to install the bootloader on:</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
@@ -232,11 +224,9 @@
                             <child>
                               <object class="GtkRadioButton" id="grub_no_new_device">
                                 <property name="label" translatable="yes">Continue without a bootloader.</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
@@ -310,11 +300,9 @@
                             <child>
                               <object class="GtkRadioButton" id="grub_fail_option">
                                 <property name="label" translatable="yes">Cancel the installation.</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">False</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="xalign">0</property>
                                 <property name="active">True</property>
                                 <property name="draw_indicator">True</property>
@@ -431,12 +419,10 @@
             <child>
               <object class="GtkButton" id="closebutton1">
                 <property name="label">gtk-close</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">True</property>
               </object>
@@ -555,12 +541,10 @@
             <child>
               <object class="GtkButton" id="quit_button">
                 <property name="label" translatable="yes">Continue using the live CD</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <signal name="clicked" handler="quit_installer" swapped="no"/>
               </object>
@@ -573,14 +557,12 @@
             <child>
               <object class="GtkButton" id="reboot_button">
                 <property name="label" translatable="yes">Restart now</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="has_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <signal name="clicked" handler="reboot" swapped="no"/>
               </object>
@@ -593,12 +575,10 @@
             <child>
               <object class="GtkButton" id="shutdown_button">
                 <property name="label" translatable="yes">Shutdown now</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <signal name="clicked" handler="shutdown" swapped="no"/>
               </object>
@@ -816,12 +796,10 @@
                                     <child>
                                       <object class="GtkButton" id="quit">
                                         <property name="label">gtk-quit</property>
-                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="can_default">True</property>
                                         <property name="receives_default">True</property>
-                                        <property name="use_action_appearance">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="use_stock">True</property>
                                         <signal name="clicked" handler="on_quit_clicked" swapped="no"/>
@@ -835,12 +813,10 @@
                                     <child>
                                       <object class="GtkButton" id="back">
                                         <property name="label">gtk-go-back</property>
-                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="can_default">True</property>
                                         <property name="receives_default">True</property>
-                                        <property name="use_action_appearance">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="use_stock">True</property>
                                         <signal name="clicked" handler="on_back_clicked" swapped="no"/>
@@ -854,13 +830,11 @@
                                     <child>
                                       <object class="GtkButton" id="next">
                                         <property name="label">Continue</property>
-                                        <property name="use_action_appearance">False</property>
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
                                         <property name="can_default">True</property>
                                         <property name="has_default">True</property>
                                         <property name="receives_default">True</property>
-                                        <property name="use_action_appearance">False</property>
                                         <property name="use_underline">True</property>
                                         <property name="use_stock">True</property>
                                         <signal name="clicked" handler="on_next_clicked" swapped="no"/>
@@ -981,10 +955,8 @@
                             <child>
                               <object class="GtkButton" id="progress_cancel_button">
                                 <property name="label" translatable="yes">_Skip</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
-                                <property name="use_action_appearance">False</property>
                                 <property name="use_underline">True</property>
                                 <signal name="clicked" handler="on_progress_cancel_button_clicked" swapped="no"/>
                               </object>
@@ -1028,6 +1000,57 @@
       </object>
     </child>
   </object>
+  <object class="GtkDialog" id="ubi_question_dialog">
+    <property name="can_focus">False</property>
+    <property name="halign">start</property>
+    <property name="valign">start</property>
+    <property name="border_width">5</property>
+    <property name="resizable">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="type_hint">dialog</property>
+    <property name="transient_for">live_installer</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox14">
+        <property name="can_focus">False</property>
+        <property name="halign">start</property>
+        <property name="valign">start</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area14">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="question_label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label" translatable="yes">label</property>
+            <property name="wrap">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
   <object class="GtkDialog" id="warning_dialog">
     <property name="can_focus">True</property>
     <property name="title" translatable="yes">Abort the installation?</property>
@@ -1052,12 +1075,10 @@
             <child>
               <object class="GtkButton" id="cancelbutton">
                 <property name="label">gtk-cancel</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_quit_cancelled" swapped="no"/>
@@ -1071,12 +1092,10 @@
             <child>
               <object class="GtkButton" id="exitbutton">
                 <property name="label">gtk-quit</property>
-                <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="use_stock">True</property>
                 <signal name="clicked" handler="quit_installer" swapped="no"/>

=== modified file 'partman/commit.d/unmount_busy'
--- partman/commit.d/unmount_busy	2009-09-09 10:06:30 +0000
+++ partman/commit.d/unmount_busy	2012-11-26 13:11:19 +0000
@@ -4,6 +4,14 @@
 # checks for mounted partitions at startup, but it may still serve as
 # insurance against partitions being mounted while the partitioner is
 # running.
+#
+# This has saved us a few times when different Desktop Environments
+# envent a new way to auto-mount partitions.
+#
+# But maybe this should skip "locked" partitions in partmans view,
+# e.g. the installation media on /dev/sda1 as it can handle those
+# cases.
+#
 
 . /lib/partman/lib/base.sh
 

=== modified file 'ubiquity/frontend/gtk_ui.py'
--- ubiquity/frontend/gtk_ui.py	2012-11-22 16:27:21 +0000
+++ ubiquity/frontend/gtk_ui.py	2012-11-26 13:11:19 +0000
@@ -1706,21 +1706,16 @@
                 text = option
             if text is None:
                 text = option
-            buttons.extend((text, len(buttons) / 2 + 1))
-        dialog = Gtk.Dialog(
-            title, self.live_installer, Gtk.DialogFlags.MODAL, tuple(buttons))
-        vbox = Gtk.Box()
-        vbox.set_orientation(Gtk.Orientation.VERTICAL)
-        vbox.set_border_width(5)
-        label = Gtk.Label(label=msg)
-        label.set_line_wrap(True)
-        label.set_selectable(False)
-        vbox.pack_start(label, True, True, 0)
-        vbox.show_all()
-        dialog.get_content_area().pack_start(vbox, True, True, 0)
-        response = dialog.run()
+            buttons.append((text, len(buttons) / 2 + 1))
+
+        self.ubi_question_dialog.set_title(title)
+        self.question_label.set_text(msg)
+        for text, response_id in buttons:
+            self.ubi_question_dialog.add_button(text, response_id)
+        self.ubi_question_dialog.show_all()
+        response = self.ubi_question_dialog.run()
         self.allow_change_step(saved_allowed_change_step)
-        dialog.hide()
+        self.ubi_question_dialog.hide()
         if response < 0:
             # something other than a button press, probably destroyed
             return None

=== modified file 'ubiquity/i18n.py'
--- ubiquity/i18n.py	2012-11-22 16:27:21 +0000
+++ ubiquity/i18n.py	2012-11-26 13:11:19 +0000
@@ -30,8 +30,7 @@
 from ubiquity import misc, im_switch
 
 
-# if 'just_country' is True, only the country is changing
-def reset_locale(frontend, just_country=False):
+def reset_locale(frontend):
     frontend.start_debconf()
     di_locale = frontend.db.get('debian-installer/locale')
     if not di_locale:
@@ -47,9 +46,6 @@
         except locale.Error as e:
             print('locale.setlocale failed: %s (LANG=%s)' % (e, di_locale),
                   file=sys.stderr)
-        if not just_country:
-            misc.execute_root(
-                'fontconfig-voodoo', '--auto', '--force', '--quiet')
         im_switch.start_im()
     return di_locale
 

=== modified file 'ubiquity/plugins/ubi-language.py'
--- ubiquity/plugins/ubi-language.py	2012-11-22 16:27:21 +0000
+++ ubiquity/plugins/ubi-language.py	2012-11-26 13:11:19 +0000
@@ -350,6 +350,8 @@
             elif self.update_installer:
                 text = i18n.get_string('update_installer_only', lang)
                 self.release_notes_label.set_markup(text)
+            else:
+                self.release_notes_label.set_markup('')
 
     def set_oem_id(self, text):
         return self.oem_id_entry.set_text(text)
@@ -745,10 +747,4 @@
                     locale.setlocale(locale.LC_ALL, '')
                 except locale.Error:
                     pass
-            # fontconfig configuration needs to be adjusted based on the
-            # selected locale (from language-selector-common.postinst). Ignore
-            # errors.
-            misc.execute(
-                'chroot', target, 'fontconfig-voodoo',
-                '--auto', '--force', '--quiet')
         return rv

=== modified file 'ubiquity/plugins/ubi-partman.py'
--- ubiquity/plugins/ubi-partman.py	2012-11-22 16:27:21 +0000
+++ ubiquity/plugins/ubi-partman.py	2012-11-26 13:11:19 +0000
@@ -271,7 +271,9 @@
         use_device = self.use_device.get_active()
         biggest_free = 'biggest_free' in self.extra_options
         crypto = self.use_crypto.get_active()
-        disks = self.extra_options['use_device'][1]
+        disks = self.extra_options.get('use_device', [])
+        if disks:
+            disks = disks[1]
         one_disk = len(disks) == 1
 
         if custom:
@@ -305,7 +307,7 @@
             self.show_encryption_passphrase(crypto)
             self.controller.go_to_page(self.current_page)
             self.controller.toggle_next_button('install_button')
-            self.plugin_is_install = True
+            self.plugin_is_install = one_disk
             self.info_loop(None)
             return True
 
@@ -419,6 +421,9 @@
         elif (self.resize_use_free.get_active() and
                 'biggest_free' in self.extra_options):
             return True
+        elif (self.use_device.get_active() and
+              len(self.extra_options['use_device'][1]) == 1):
+            return True
         else:
             return False
 
@@ -2052,6 +2057,10 @@
         '''
         options = {}
         release = misc.get_release()
+        if not operating_systems:
+            operating_systems = []
+        if not ubuntu_systems:
+            ubuntu_systems = []
         os_count = len(operating_systems)
         wubi_option = 'wubi' in self.extra_options
 
@@ -2074,6 +2083,11 @@
         desc = self.extended_description(q)
         options['manual'] = PartitioningOption(title, desc)
 
+        # Panda board without SD-card does not have use_device options
+        # quit here for now
+        if 'use_device' not in self.extra_options:
+            return options
+
         if os_count == 0:
             # "There are no operating systems present" case
             q = 'ubiquity/partitioner/no_systems_format'
@@ -2391,6 +2405,17 @@
         elif question == 'partman/choose_partition':
             self.autopartition_question = None  # not autopartitioning any more
 
+            if 'manual' not in self.extra_options:
+                # Couldn't autopartition hence the partAsk page was skipped.
+                self.extra_options['manual'] = self.manual_desc
+                options = self.calculate_autopartitioning_options(False, False)
+                self.ui.set_autopartition_options(options, self.extra_options)
+                if hasattr(self.ui, 'plugin_on_next_clicked'):
+                    self.ui.plugin_on_next_clicked()
+                # Here be dragons...
+                self.preseed('ubiquity/partman-skip-unmount', 'true',
+                             seen=False)
+                    
             if not self.building_cache and self.update_partitions:
                 # Rebuild our cache of just these partitions.
                 self.__state = [['', None, None]]

=== modified file 'ubiquity/plugins/ubi-timezone.py'
--- ubiquity/plugins/ubi-timezone.py	2012-11-22 16:27:21 +0000
+++ ubiquity/plugins/ubi-timezone.py	2012-11-26 13:11:19 +0000
@@ -702,8 +702,7 @@
 
     def cleanup(self):
         plugin.Plugin.cleanup(self)
-        self.ui.controller.set_locale(
-            i18n.reset_locale(self.frontend, just_country=True))
+        self.ui.controller.set_locale(i18n.reset_locale(self.frontend))
 
 
 class Install(plugin.InstallPlugin):