lib/passphrase.py | 4 ++++ storage.py | 8 ++++++++ 2 files changed, 12 insertions(+)
We didn't apply the checks/controls of the dialog until some text was entered, which allowed users to click through without entering anything. --- pyanaconda/ui/gui/spokes/lib/passphrase.py | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/lib/passphrase.py b/pyanaconda/ui/gui/spokes/lib/passphrase.py index c629cd7..7bfa52c 100644 --- a/pyanaconda/ui/gui/spokes/lib/passphrase.py +++ b/pyanaconda/ui/gui/spokes/lib/passphrase.py @@ -85,6 +85,10 @@ class PassphraseDialog(GUIObject): # initialize with the previously set passphrase self.passphrase = self.data.autopart.passphrase
+ if not self.passphrase: + self._save_button.set_sensitive(False) + self._confirm_entry.set_sensitive(False) + self._passphrase_entry.set_text(self.passphrase) self._confirm_entry.set_text(self.passphrase)
This got broken by commit 33673a5c0. Previously after reclaim we would run through on_continue_clicked again and presumably go through the "continue" path, which is where we'd prompt for the passphrase. --- pyanaconda/ui/gui/spokes/storage.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index 95ac1b7..23b97fc 100644 --- a/pyanaconda/ui/gui/spokes/storage.py +++ b/pyanaconda/ui/gui/spokes/storage.py @@ -715,6 +715,14 @@ class StorageSpoke(NormalSpoke, StorageChecker): if dialog.custom: self.skipTo = "CustomPartitioningSpoke" else: + if self.encrypted: + dialog = PassphraseDialog(self.data) + rc = self.run_lightbox_dialog(dialog) + if rc == 0: + return + + self.passphrase = dialog.passphrase + self.apply()
resizeDialog = ResizeDialog(self.data, self.storage, self.payload)
anaconda-patches@lists.fedorahosted.org