diff options
author | Jeremy Katz <katzj@redhat.com> | 2005-10-04 15:59:16 +0000 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2005-10-04 15:59:16 +0000 |
commit | 7df372a396c46e0193a6e329ed3d7c9da7bd82da (patch) | |
tree | 320715fa8015c533c50a5a3f8f23aac6d3474ff6 /textw/partition_text.py | |
parent | 07b8e9a05d89e806650a88a27050e5d200d32b94 (diff) | |
download | anaconda-7df372a396c46e0193a6e329ed3d7c9da7bd82da.tar.gz anaconda-7df372a396c46e0193a6e329ed3d7c9da7bd82da.tar.xz anaconda-7df372a396c46e0193a6e329ed3d7c9da7bd82da.zip |
2005-10-04 Jeremy Katz <katzj@redhat.com>
* iw/autopart_type.py (PartitionTypeWindow.getNext): Don't skip
manual partitioning if we're doing custom partitions (#169001)
(PartitionTypeWindow.comboChanged): Also make it obvious what's
going on with custom partitioning + review checkbox
* ui/autopart.glade: Add callback.
* textw/partition_text.py (PartitionTypeWindow.__call__): Properly
shut down UI if custom partitioning selected.
Diffstat (limited to 'textw/partition_text.py')
-rw-r--r-- | textw/partition_text.py | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/textw/partition_text.py b/textw/partition_text.py index 3e01c3bfe..a2196409c 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -1684,6 +1684,7 @@ class PartitionTypeWindow: cur = typebox.current() if cur == -1: dispatch.skipStep("autopartitionexecute", skip = 1) + break else: dispatch.skipStep("autopartitionexecute", skip = 0) @@ -1691,14 +1692,15 @@ class PartitionTypeWindow: partitions.autoClearPartDrives = self.drivelist.getSelection() if queryAutoPartitionOK(intf, diskset, partitions): - self.shutdownUI() - screen.popWindow() + break - # XXX we always unskip disk druid in tui right now since - # we don't ask if you want to review amd if you're using - # text mode, we hope you're smart enough to deal (#82474) - dispatch.skipStep("partition", skip = 0) - - return INSTALL_OK + self.shutdownUI() + screen.popWindow() + + # XXX we always unskip disk druid in tui right now since + # we don't ask if you want to review amd if you're using + # text mode, we hope you're smart enough to deal (#82474) + dispatch.skipStep("partition", skip = 0) + return INSTALL_OK |