diff options
| author | Ales Kozumplik <akozumpl@redhat.com> | 2011-10-18 15:56:04 +0200 |
|---|---|---|
| committer | Ales Kozumplik <akozumpl@redhat.com> | 2011-10-21 13:33:46 +0200 |
| commit | 4b0fc852b5d4d675add29b021203b625d3ece8cc (patch) | |
| tree | 4fc67e41c1fe5f941df124f177a3c0d7e64ba661 /pyanaconda | |
| parent | 0c5d7418fadfacacb86484046ed0d17e2fc740d3 (diff) | |
| download | anaconda-4b0fc852b5d4d675add29b021203b625d3ece8cc.tar.gz anaconda-4b0fc852b5d4d675add29b021203b625d3ece8cc.tar.xz anaconda-4b0fc852b5d4d675add29b021203b625d3ece8cc.zip | |
Do a better job of remembering if 'review and modify partitioning' was checked.
The scheduling is reverted when going back thus it can not be used to
remember user's choice that should preserve if reentering a particular
screen.
Resolves: rhbz#746703
Diffstat (limited to 'pyanaconda')
| -rw-r--r-- | pyanaconda/dispatch.py | 5 | ||||
| -rw-r--r-- | pyanaconda/iw/autopart_type.py | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/pyanaconda/dispatch.py b/pyanaconda/dispatch.py index 6aeae38ba..18bfa58a9 100644 --- a/pyanaconda/dispatch.py +++ b/pyanaconda/dispatch.py @@ -86,6 +86,8 @@ class Step(object): self.name = name self.target = target # None for dynamic target (e.g. gui view) self._sched = self.SCHED_UNSCHEDULED + self.client_data = {} # used by the client code, not reset when + # scheduling is reverted def _reschedule(self, to_sched, current_step): s_from = self.sched @@ -334,6 +336,9 @@ class Dispatcher(object): except errors.DispatchError as e: log.debug("dispatch: %s" % e) + def step_data(self, step): + return self.steps[step].client_data + def step_disabled(self, step): """ True if step is not yet scheduled to be run or will never be run (i.e. is skipped). diff --git a/pyanaconda/iw/autopart_type.py b/pyanaconda/iw/autopart_type.py index e915e2a63..6dca7e159 100644 --- a/pyanaconda/iw/autopart_type.py +++ b/pyanaconda/iw/autopart_type.py @@ -204,6 +204,7 @@ class PartitionTypeWindow(InstallWindow): self.storage.doAutoPart = True + self.dispatch.step_data("parttype")["review_checked"] = self.reviewButton.get_active() if self.reviewButton.get_active(): self.dispatch.request_steps("partition") # with kickstart bootloader is already scheduled to be skipped: @@ -257,7 +258,10 @@ class PartitionTypeWindow(InstallWindow): self.table = self.xml.get_widget("parttypeTable") self.prevrev = None - self.reviewButton.set_active(self.dispatch.step_enabled("partition")) + + step_data = self.dispatch.step_data("parttype") + self.reviewButton.set_active( + step_data.get("review_checked", self.dispatch.step_enabled("partition"))) self.encryptButton.set_active(self.storage.encryptedAutoPart) self.lvmButton.set_active(self.storage.lvmAutoPart) |