diff options
| author | Chris Lumens <clumens@redhat.com> | 2006-10-19 16:51:06 +0000 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2006-10-19 16:51:06 +0000 |
| commit | c971797a713dce3315ffd72f03ffaac445770191 (patch) | |
| tree | f9a7eaa3d73aa7ed1d872d8a8fa06f3949fd39b2 | |
| parent | 9bf68eba1e36d3e6f7e9e9f1fe9ceae9da73e461 (diff) | |
| download | anaconda-c971797a713dce3315ffd72f03ffaac445770191.tar.gz anaconda-c971797a713dce3315ffd72f03ffaac445770191.tar.xz anaconda-c971797a713dce3315ffd72f03ffaac445770191.zip | |
Forget partitioning changes when going back to the parttype screen (#211255).
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | iw/partition_gui.py | 7 | ||||
| -rw-r--r-- | textw/partition_text.py | 3 |
3 files changed, 11 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2006-10-19 Chris Lumens <clumens@redhat.com> + + * iw/partition_gui.py (PartitionWindow.getPrev): Forget partitioning + changes when going back to the parttype screen (#211255). + * textw/partition_text.py (PartitionWindow.__call__): Likewise. + 2006-10-18 David Cantrell <dcantrell@redhat.com> * anaconda (parseOptions): Add the --noipv4 and --noipv6 opts (#208334). diff --git a/iw/partition_gui.py b/iw/partition_gui.py index 9c1ab489e..0fc1b7230 100644 --- a/iw/partition_gui.py +++ b/iw/partition_gui.py @@ -691,6 +691,8 @@ class PartitionWindow(InstallWindow): def getPrev(self): self.diskStripeGraph.shutDown() + self.diskset.refreshDevices() + self.partitions.setFromDisk(self.diskset) self.tree.clear() del self.parent return None @@ -965,7 +967,6 @@ class PartitionWindow(InstallWindow): return self.diskStripeGraph.shutDown() - self.newFsset = self.fsset.copy() self.diskset.refreshDevices() self.partitions.setFromDisk(self.diskset) self.tree.clear() @@ -1341,10 +1342,6 @@ class PartitionWindow(InstallWindow): checkForSwapNoMatch(anaconda) - # XXX PartitionRequests() should already exist and - # if upgrade or going back, have info filled in -# self.newFsset = self.fsset.copy() - # load up checkmark self.checkmark_pixbuf = gtk.gdk.pixbuf_new_from_inline(len(new_checkmark), new_checkmark, False) diff --git a/textw/partition_text.py b/textw/partition_text.py index 9b7b805e0..8be7f2bb7 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -1468,6 +1468,9 @@ class PartitionWindow: elif res == TEXT_BACK_CHECK: # remove refs to parted objects self.shutdownMainUI() + + self.diskset.refreshDevices() + self.partitions.setFromDisk(self.diskset) screen.popHelpLine() screen.popWindow() |