[PATCH 4/4] Fix problems going into custom partitioning with the new work flow.

Chris Lumens clumens at redhat.com
Fri Jan 17 18:53:58 UTC 2014


(1) If the user's checked both the reclaim button and the custom button,
do not display the reclaim dialog.  That's what custom partitioning is
for.

(2) If the user's checked both the encryption button and the custom button,
do not display the passphrase dialog before custom partitioning.  It gets
displayed afterwards.
---
 pyanaconda/ui/gui/spokes/storage.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py
index e2c453e..fb08041 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -747,25 +747,25 @@ class StorageSpoke(NormalSpoke, StorageChecker):
             #    - OR -
             # Not enough room, but the user checked the reclaim button.
 
-            # But first, we need to ask about an encryption passphrase if that
-            # checkbox was active.
             self.encrypted = self._encrypted.get_active()
-            if not self._check_encrypted():
-                return
-
-            # Oh and then we might also want to go to the reclaim dialog.
-            if self._reclaim.get_active():
-                self.apply()
-                if not self._show_resize_dialog(disks):
-                    # User pressed cancel on the reclaim dialog, so don't leave
-                    # the storage spoke.
-                    return
 
             if self._customPart.get_active():
                 self.autopart = False
                 self.skipTo = "CustomPartitioningSpoke"
             else:
                 self.autopart = True
+
+                # We might first need to ask about an encryption passphrase.
+                if not self._check_encrypted():
+                    return
+
+                # Oh and then we might also want to go to the reclaim dialog.
+                if self._reclaim.get_active():
+                    self.apply()
+                    if not self._show_resize_dialog(disks):
+                        # User pressed cancel on the reclaim dialog, so don't leave
+                        # the storage spoke.
+                        return
         elif rc == RESPONSE_CANCEL:
             # A cancel button was clicked on one of the dialogs.  Stay on this
             # spoke.  Generally, this is because the user wants to add more disks.
-- 
1.8.3.1



More information about the anaconda-patches mailing list