[f22-branch 4/6] Prevent any changes in the StorageSpoke if just going back
vpodzime
installerbot-noreply at redhat.com
Thu Apr 16 11:34:57 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.
---
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 7f12235..d71ccce 100644
--- a/pyanaconda/ui/gui/spokes/storage.py
+++ b/pyanaconda/ui/gui/spokes/storage.py
@@ -829,6 +829,12 @@ def on_back_clicked(self, button):
else:
self._back_clicked = True
+ 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:
@@ -838,12 +844,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/3718a0ce12e531b02286d6a58de1bdc24d0613b0
More information about the anaconda-patches
mailing list