diff options
| author | Chris Lumens <clumens@redhat.com> | 2006-05-25 21:57:38 +0000 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2006-05-25 21:57:38 +0000 |
| commit | 6ef9d2203e393e74d0fdeef08ff920a37b93e8d5 (patch) | |
| tree | 1e0f288628c1e9317c647b7d61a6f9cc048967eb /textw | |
| parent | ad01cbb94da177db7318138422a212e5154ea655 (diff) | |
| download | anaconda-6ef9d2203e393e74d0fdeef08ff920a37b93e8d5.tar.gz anaconda-6ef9d2203e393e74d0fdeef08ff920a37b93e8d5.tar.xz anaconda-6ef9d2203e393e74d0fdeef08ff920a37b93e8d5.zip | |
Skip partition review dialog if it's custom partitioning.
Diffstat (limited to 'textw')
| -rw-r--r-- | textw/partition_text.py | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/textw/partition_text.py b/textw/partition_text.py index 2f2ed622c..56332c62a 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -1584,30 +1584,31 @@ class PartitionTypeWindow: mustHaveSelectedDrive(anaconda.intf) continue - cur = typebox.current() - if cur == -1: + partmethod_ans = typebox.current() + if partmethod_ans == -1: anaconda.dispatch.skipStep("autopartitionexecute", skip = 1) break else: anaconda.dispatch.skipStep("autopartitionexecute", skip = 0) - anaconda.id.partitions.autoClearPartType = cur + anaconda.id.partitions.autoClearPartType = partmethod_ans anaconda.id.partitions.autoClearPartDrives = self.drivelist.getSelection() if queryAutoPartitionOK(anaconda): break - # ask to review autopartition layout - reviewLayout = anaconda.intf.messageWindow(_("Review Partition Layout"), - _("Review and modify partitioning layout?"), - type = "yesno") + # ask to review autopartition layout - but only if it's not custom partitioning + anaconda.dispatch.skipStep("partition", skip = 0) + anaconda.dispatch.skipStep("bootloader", skip = 0) - if reviewLayout == 1: - anaconda.dispatch.skipStep("partition", skip = 0) - anaconda.dispatch.skipStep("bootloader", skip = 0) - else: - anaconda.dispatch.skipStep("partition", skip = 1) - anaconda.dispatch.skipStep("bootloader", skip = 1) + if partmethod_ans != -1: + reviewLayout = anaconda.intf.messageWindow(_("Review Partition Layout"), + _("Review and modify partitioning layout?"), + type = "yesno") + + if reviewLayout != 1: + anaconda.dispatch.skipStep("partition", skip = 1) + anaconda.dispatch.skipStep("bootloader", skip = 1) self.shutdownUI() screen.popWindow() |