[master 2/4] Prevent any changes in the StorageSpoke if just going back
vpodzime
installerbot-noreply at redhat.com
Wed Jul 29 09:26:04 UTC 2015
From: Vratislav Podzimek <vpodzime at 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 f13a155..d77e9d3 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
-
if arch.isS390():
# check for unformatted DASDs and launch dasdfmt if any discovered
rc = self._check_dasd_formats()
--
To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/f885d74ae6797f911877b882ce93bcb8d0a6c49f
More information about the anaconda-patches
mailing list