From: Vratislav Podzimek vpodzime@redhat.com
If user deselects all disks it means they just want to go back from the disk selection screen. If that's the case, we shouldn't do any changes to storage configuration.
Conflicts: pyanaconda/ui/gui/spokes/storage.py
(cherry-picked from commit 0c9a8bc1192c320bc1461687e88f4275eff4b213) --- pyanaconda/ui/gui/spokes/storage.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pyanaconda/ui/gui/spokes/storage.py b/pyanaconda/ui/gui/spokes/storage.py index 552d70a..b651d79 100644 --- a/pyanaconda/ui/gui/spokes/storage.py +++ b/pyanaconda/ui/gui/spokes/storage.py @@ -858,6 +858,12 @@ def on_back_clicked(self, button): NormalSpoke.on_back_clicked(self, button) return
+ disks = [d for d in self.disks if d.name in self.selected_disks] + # No disks selected? The user wants to back out of the storage spoke. + if not disks: + NormalSpoke.on_back_clicked(self, button) + return + # Remove all non-existing devices if autopart was active when we last # refreshed. if self._previous_autopart: @@ -867,12 +873,6 @@ def on_back_clicked(self, button): # hide/unhide disks as requested self._hide_unhide_disks()
- disks = [d for d in self.disks if d.name in self.selected_disks] - # No disks selected? The user wants to back out of the storage spoke. - if not disks: - NormalSpoke.on_back_clicked(self, button) - return - # make sure no containers were split up by the user's disk selection self.clear_info() self.errors = checkDiskSelection(self.storage, self.selected_disks)