------------------------------------------------------------
revno: 5627
fixes bug: https://launchpad.net/bugs/1046175
committer: Dmitrijs Ledkovs <dmitrijs.ledkovs@canonical.com>
branch nick: trunk
timestamp: Wed 2012-09-05 12:11:37 +0100
message:
  Allow to select primary/logical partitions, instead of always hiding
  it (LP: #1046175).
diff:
=== modified file 'debian/changelog'
--- debian/changelog	2012-09-04 17:50:18 +0000
+++ debian/changelog	2012-09-05 11:11:37 +0000
@@ -1,3 +1,10 @@
+ubiquity (2.11.30) UNRELEASED; urgency=low
+
+  * Allow to select primary/logical partitions, instead of always hiding
+    it (LP: #1046175).
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com>  Wed, 05 Sep 2012 12:08:34 +0100
+
 ubiquity (2.11.29) quantal; urgency=low
 
   [ Colin Watson ]

=== modified file 'ubiquity/plugins/ubi-partman.py'
--- ubiquity/plugins/ubi-partman.py	2012-09-03 11:52:33 +0000
+++ ubiquity/plugins/ubi-partman.py	2012-09-05 11:11:37 +0000
@@ -849,7 +849,11 @@
             self.partition_create_place_label.hide()
             self.partition_create_place_beginning.hide()
             self.partition_create_place_end.hide()
+            self.partition_create_type_label.hide()
+            self.partition_create_type_primary.hide()
+            self.partition_create_type_logical.hide()
 
+        # TODO xnox 2012-09-05 hide manual crypto/lvm UI until ready
         for widget in ['password_grid', 'crypto_label', 'crypto_warning',
                        'verified_crypto_label', 'crypto_extra_label',
                        'crypto_overwrite_space', 'crypto_extra_time',
@@ -861,7 +865,7 @@
         # TODO cjwatson 2006-11-01: Because partman doesn't use a question
         # group for these, we have to figure out in advance whether each
         # question is going to be asked.
-        if not create and partition['parted']['type'] == 'pri/log':
+        if create and partition['parted']['type'] == 'pri/log':
             # Is there already a primary partition?
             model = self.partition_list_treeview.get_model()
             for otherpart in [row[1] for row in model]:
@@ -872,10 +876,6 @@
                     break
             else:
                 self.partition_create_type_primary.set_active(True)
-        else:
-            self.partition_create_type_label.hide()
-            self.partition_create_type_primary.hide()
-            self.partition_create_type_logical.hide()
 
         # Yes, I know, 1000000 bytes is annoying. Sorry. This is what
         # partman expects.