60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
From 65b176260404087f625132697c1e299db0b0163e Mon Sep 17 00:00:00 2001
|
|
From: Vendula Poncova <vponcova@redhat.com>
|
|
Date: Wed, 8 Jul 2020 19:07:54 +0200
|
|
Subject: [PATCH] Schedule timed actions with the right selector (#1851647)
|
|
|
|
The timed actions of the Custom Partitioning spoke should be scheduled with
|
|
the specified selector. Otherwise, the action will use the current selector
|
|
that might be different.
|
|
|
|
Resolves: rhbz#1851647
|
|
---
|
|
pyanaconda/ui/gui/spokes/custom_storage.py | 20 ++++++++++++++++----
|
|
1 file changed, 16 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/pyanaconda/ui/gui/spokes/custom_storage.py b/pyanaconda/ui/gui/spokes/custom_storage.py
|
|
index b89866c..a5e568f 100644
|
|
--- a/pyanaconda/ui/gui/spokes/custom_storage.py
|
|
+++ b/pyanaconda/ui/gui/spokes/custom_storage.py
|
|
@@ -1836,21 +1836,33 @@ class CustomPartitioningSpoke(NormalSpoke, StorageCheckHandler):
|
|
dlg.run()
|
|
dlg.destroy()
|
|
|
|
- @timed_action(delay=50, threshold=100)
|
|
def on_update_settings_clicked(self, button):
|
|
+ self._update_settings(self._accordion.current_selector)
|
|
+
|
|
+ @timed_action(delay=50, threshold=100)
|
|
+ def _update_settings(self, selector):
|
|
""" call _save_right_side, then, perhaps, populate_right_side. """
|
|
+ if not selector:
|
|
+ return
|
|
+
|
|
# Clear any existing errors
|
|
self.clear_errors()
|
|
|
|
# Save anything from the currently displayed mount point.
|
|
- self._save_right_side(self._accordion.current_selector)
|
|
+ self._save_right_side(selector)
|
|
self._applyButton.set_sensitive(False)
|
|
|
|
- @timed_action(delay=50, threshold=100)
|
|
def on_unlock_clicked(self, *args):
|
|
+ self._unlock_device(self._accordion.current_selector)
|
|
+
|
|
+ @timed_action(delay=50, threshold=100)
|
|
+ def _unlock_device(self, selector):
|
|
""" try to open the luks device, populate, then call _do_refresh. """
|
|
+ if not selector:
|
|
+ return
|
|
+
|
|
self.clear_errors()
|
|
- device_name = self._accordion.current_selector.device_name
|
|
+ device_name = selector.device_name
|
|
passphrase = self._passphraseEntry.get_text()
|
|
|
|
log.info("Trying to unlock device %s.", device_name)
|
|
--
|
|
2.23.0
|
|
|