summaryrefslogtreecommitdiffstats
path: root/iw
diff options
context:
space:
mode:
authorbfox <bfox>2001-03-15 17:53:31 +0000
committerbfox <bfox>2001-03-15 17:53:31 +0000
commit978ee9a01bb28dce64490403d6b1a110d5c8f156 (patch)
tree7f7963c05bf788ca2f96a67bcb6e2d381a61899e /iw
parent6a3bdd7dba8b1ffc586e5dfd24805b6422e19d77 (diff)
downloadanaconda-978ee9a01bb28dce64490403d6b1a110d5c8f156.tar.gz
anaconda-978ee9a01bb28dce64490403d6b1a110d5c8f156.tar.xz
anaconda-978ee9a01bb28dce64490403d6b1a110d5c8f156.zip
Avoid going into getNext when self.neededSwap does not exist. Resolves bug # 31783
Diffstat (limited to 'iw')
-rw-r--r--iw/upgrade_swap_gui.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/iw/upgrade_swap_gui.py b/iw/upgrade_swap_gui.py
index 171910cbf..5cede3497 100644
--- a/iw/upgrade_swap_gui.py
+++ b/iw/upgrade_swap_gui.py
@@ -19,6 +19,10 @@ class UpgradeSwapWindow (InstallWindow):
ics.readHTML ("upswapfile")
def getNext (self):
+ #-If the user doesn't need to add swap, we don't do anything
+ if not self.neededSwap:
+ return None
+
mnt, part, size = self.clist.get_row_data(self.row)
val = int(self.entry.get_text())
size = int(size)
@@ -59,6 +63,7 @@ class UpgradeSwapWindow (InstallWindow):
self.row = row
def getScreen (self):
+ self.neededSwap = 0
rc = upgrade.swapSuggestion(self.todo.instPath, self.todo.fstab)
if not rc:
threads_leave()
@@ -66,6 +71,7 @@ class UpgradeSwapWindow (InstallWindow):
threads_enter()
return None
+ self.neededSwap = 1
self.row = 0
box = GtkVBox (FALSE, 5)
box.set_border_width (5)