Merge lp:~xnox/ubiquity/fix-crypt-qt-page into lp:ubiquity

[Dimitri John Ledkov]

[lp:~xnox/ubiquity/fix-crypt-qt-page]

5913. By Dimitri John Ledkov on 2013-04-24

[Qt Frontend] Clear use as combo box, on each iteration to avoid
duplicated entries. (LP: #1171989) Thanks merryidleness for the patch.

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-23 12:25:58 +0000
+++ debian/changelog	2013-04-24 13:38:26 +0000
@@ -1,3 +1,14 @@
+ubiquity (2.14.7) UNRELEASED; urgency=low
+
+  * [Qt Frontend] Do not allow to proceed from partitioning page when
+    password is required, yet missing or does not match confirmation
+    password. (LP: #1172059)
+
+  * [Qt Frontend] Clear use as combo box, on each iteration to avoid
+    duplicated entries. (LP: #1171989) Thanks merryidleness for the patch.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Wed, 24 Apr 2013 11:40:29 +0100
+
 ubiquity (2.14.6) raring; urgency=low
 
   * Automatic update of included source packages: partman-auto 105ubuntu3
 
=== modified file 'ubiquity/frontend/kde_components/PartAuto.py'
--- ubiquity/frontend/kde_components/PartAuto.py	2013-02-19 11:33:07 +0000
+++ ubiquity/frontend/kde_components/PartAuto.py	2013-04-24 13:38:26 +0000
@@ -288,15 +288,25 @@
             self.password.setEnabled(True)
             self.verified_password.setEnabled(True)
             self.badPassword.setEnabled(True)
+            self.verify_password()
         else:
             self.passwordIcon.setEnabled(False)
             self.password.setEnabled(False)
             self.verified_password.setEnabled(False)
             self.badPassword.setEnabled(False)
+            self.controller.allow_go_forward(True)
 
     #show warning if passwords do not match
     def verify_password(self):
-        if self.password.text() != self.verified_password.text():
+        complete = False
+
+        if self.password.text() == self.verified_password.text():
+            self.badPassword.hide()
+            complete = True
+        else:
             self.badPassword.show()
-        else:
-            self.badPassword.hide()
+
+        if not self.password.text():
+            complete = False
+
+        self.controller.allow_go_forward(complete)
 
=== modified file 'ubiquity/frontend/kde_components/PartMan.py'
--- ubiquity/frontend/kde_components/PartMan.py	2013-02-15 16:56:45 +0000
+++ ubiquity/frontend/kde_components/PartMan.py	2013-04-24 13:38:26 +0000
@@ -178,6 +178,10 @@
         dialog.partition_create_place_beginning.setChecked(True)
 
         self.create_use_method_names = {}
+        
+        # Remove any previous entries
+        dialog.partition_create_use_combo.clear()
+        
         for method, name, description in (
                 self.ctrlr.dbfilter.use_as(devpart, True)):
             self.create_use_method_names[description] = name