diff options
author | Matt Wilson <msw@redhat.com> | 2001-03-26 18:12:01 +0000 |
---|---|---|
committer | Matt Wilson <msw@redhat.com> | 2001-03-26 18:12:01 +0000 |
commit | a2d28cb8bd77370ab5ceaefc27159920cc223a3c (patch) | |
tree | 5e84345aa4f16c671105f21ed4342cf395896fa5 | |
parent | 9a46e0e8d70571e7011052acc57573be58d2fc98 (diff) | |
download | anaconda-a2d28cb8bd77370ab5ceaefc27159920cc223a3c.tar.gz anaconda-a2d28cb8bd77370ab5ceaefc27159920cc223a3c.tar.xz anaconda-a2d28cb8bd77370ab5ceaefc27159920cc223a3c.zip |
gui.py: possible fix for #33103: reset the frame's label always
fstab.py: we already have the intf's progressWindow stored in self,
don't require it to be passed in
todo.py: fix the call to fstab.turnOnSwap to use the new method
iw/rootpartition_gui.py: ditto. why was it passing a waitwindow, anyway?!
textw/partitioning_text.py: ditto.
-rw-r--r-- | fstab.py | 4 | ||||
-rwxr-xr-x | gui.py | 1 | ||||
-rw-r--r-- | iw/rootpartition_gui.py | 2 | ||||
-rw-r--r-- | textw/partitioning_text.py | 2 | ||||
-rw-r--r-- | todo.py | 6 |
5 files changed, 7 insertions, 8 deletions
@@ -478,7 +478,7 @@ class Fstab: for n in enabledSwapDict().keys(): isys.swapoff(n) - def turnOnSwap(self, instPath, progressWindow, formatSwap = 1): + def turnOnSwap(self, instPath, formatSwap = 1): swaps = enabledSwapDict() iutil.mkdirChain('/tmp/swap') @@ -496,7 +496,7 @@ class Fstab: if not os.access(file, os.R_OK): if type(size) == type(1): - isys.ddfile(file, size, (progressWindow, + isys.ddfile(file, size, (self.progressWindow, _("Swap Space"), _("Creating swap space..."))) @@ -629,6 +629,7 @@ class InstallControlWindow: self.installFrame.remove (child) child.destroy () + self.installFrame.set_label (_(screen.getICS ().getTitle ())) self.installFrame.add (new_screen) self.installFrame.show_all () diff --git a/iw/rootpartition_gui.py b/iw/rootpartition_gui.py index 1385377ec..77ceeccbe 100644 --- a/iw/rootpartition_gui.py +++ b/iw/rootpartition_gui.py @@ -59,7 +59,7 @@ class PartitionWindow (InstallWindow): return 0 self.todo.fstab.savePartitions() - self.todo.fstab.turnOnSwap(self.todo.intf.waitWindow) + self.todo.fstab.turnOnSwap(self.todo.instPath) self.todo.ddruidAlreadySaved = 1 PartitionWindow.swapon = 1 diff --git a/textw/partitioning_text.py b/textw/partitioning_text.py index 64483ced6..62130e444 100644 --- a/textw/partitioning_text.py +++ b/textw/partitioning_text.py @@ -224,7 +224,7 @@ class TurnOnSwapWindow: return INSTALL_BACK todo.fstab.savePartitions () - todo.fstab.turnOnSwap() + todo.fstab.turnOnSwap(todo.instPath) todo.ddruidAlreadySaved = 1 self.beenTurnedOn = 1 @@ -1213,8 +1213,7 @@ class ToDo: fstab.readFstab(self.instPath + '/etc/fstab', self.fstab) - self.fstab.turnOnSwap(self.instPath, self.intf.progressWindow, - formatSwap = 0) + self.fstab.turnOnSwap(self.instPath, formatSwap = 0) def upgradeFindPackages (self): self.getCompsList () @@ -1750,8 +1749,7 @@ class ToDo: else: self.fstab.savePartitions () self.fstab.makeFilesystems () - self.fstab.turnOnSwap(self.instPath, - self.intf.progressWindow) + self.fstab.turnOnSwap(self.instPath) # We do this for upgrades, even though everything is already # mounted. While this may seem a bit strange, we reference |