Merge lp:~cyphermox/ubiquity/force_uefi into lp:ubiquity

[Mathieu Trudel-Lapierre]

Better handle the partman-efi/non_efi_system question and its meaning.

=== modified file 'debian/changelog'
--- debian/changelog	2015-04-15 17:52:44 +0000
+++ debian/changelog	2015-04-15 22:50:32 +0000
@@ -1,3 +1,16 @@
+ubiquity (2.21.22) UNRELEASED; urgency=medium
+
+  * debian/ubiquity.templates: add a string for "Continue in UEFI mode".
+  * ubiquity/plugins/ubi-partman.py: Fix up the buttons for the non_efi_system
+    question to use the new string for UEFI mode.
+  * ubiquity/plugins/ubi-partman.py: try to reverse the meaning of the debconf
+    partman-efi/non_efi_system question so that "Continue in UEFI mode" will
+    actually really mean continuing with setting up an EFI System Partition
+    and "Go Back" will properly return to the partitioning scheme selection
+    page and allow to try again without an ESP. (LP: #1444104)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Tue, 14 Apr 2015 14:31:03 -0500
+
 ubiquity (2.21.21) vivid; urgency=medium
 
   * KDE: ubiquity/plugins/ubi-console-setup.py workaround for LP: #1182784

=== modified file 'debian/ubiquity.templates'
--- debian/ubiquity.templates	2014-04-22 13:31:25 +0000
+++ debian/ubiquity.templates	2015-04-15 22:50:32 +0000
@@ -500,6 +500,11 @@
 # Translators, this text will appear on a button, so KEEP IT SHORT
 _Description: Continue
 
+Template: ubiquity/text/in_uefi_mode
+Type: text
+# Translators, this text will appear on a button, so KEEP IT SHORT
+_Description: Continue in UEFI mode
+
 Template: ubiquity/finished_restart_only
 Type: text
 _Description:

=== modified file 'ubiquity/plugins/ubi-partman.py'
--- ubiquity/plugins/ubi-partman.py	2015-02-04 18:43:17 +0000
+++ ubiquity/plugins/ubi-partman.py	2015-04-15 22:50:32 +0000
@@ -3211,6 +3211,9 @@
             if question == 'partman/unmount_active':
                 yes = 'ubiquity/imported/yes'
                 no = 'ubiquity/imported/no'
+            elif question == 'partman-efi/non_efi_system':
+                yes = 'ubiquity/text/in_uefi_mode'
+                no = 'ubiquity/text/go_back'
             else:
                 yes = 'ubiquity/text/continue'
                 no = 'ubiquity/text/go_back'
@@ -3219,7 +3222,9 @@
                 self.extended_description(question), (no, yes))
 
             answer_reversed = False
-            if question in ('partman-jfs/jfs_boot', 'partman-jfs/jfs_root',
+            if question in ('partman-jfs/jfs_boot',
+                            'partman-jfs/jfs_root',
+                            'partman-efi/non_efi_system',
                             'partman/unmount_active'):
                 answer_reversed = True
             if response == yes: