---
pyanaconda/iw/autopart_type.py | 4 ++--
pyanaconda/iw/bootloader_main_gui.py | 4 ++--
pyanaconda/iw/upgrade_bootloader_gui.py | 9 ++++-----
pyanaconda/text.py | 11 ++++++-----
pyanaconda/textw/upgrade_bootloader_text.py | 8 ++++----
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/pyanaconda/iw/autopart_type.py b/pyanaconda/iw/autopart_type.py
index 937ff11..2ca0013 100644
--- a/pyanaconda/iw/autopart_type.py
+++ b/pyanaconda/iw/autopart_type.py
@@ -163,7 +163,7 @@ class PartitionTypeWindow(InstallWindow):
self.dispatch.skipStep("autopartitionexecute")
self.dispatch.skipStep("cleardiskssel")
self.dispatch.request_step("partition")
- self.dispatch.skipStep("bootloader", skip = 0)
+ self.dispatch.request_step("bootloader")
self.storage.config.clearPartType = CLEARPART_TYPE_NONE
else:
@@ -198,7 +198,7 @@ class PartitionTypeWindow(InstallWindow):
if self.reviewButton.get_active():
self.dispatch.request_step("partition")
- self.dispatch.skipStep("bootloader", skip = 0)
+ self.dispatch.request_step("bootloader")
else:
self.dispatch.skipStep("partition")
self.dispatch.skipStep("bootloader")
diff --git a/pyanaconda/iw/bootloader_main_gui.py b/pyanaconda/iw/bootloader_main_gui.py
index 2eed717..cee1a1c 100644
--- a/pyanaconda/iw/bootloader_main_gui.py
+++ b/pyanaconda/iw/bootloader_main_gui.py
@@ -56,7 +56,7 @@ class MainBootloaderWindow(InstallWindow):
self.dispatch.skipStep("instbootloader")
return
else:
- self.dispatch.skipStep("instbootloader", skip = 0)
+ self.dispatch.request_step("instbootloader")
# set the password
self.bl.password = self.blpass.getPassword()
@@ -183,7 +183,7 @@ class MainBootloaderWindow(InstallWindow):
hb = gtk.HBox(False, 12)
self.grubCB = gtk.CheckButton(_("_Install boot loader on %s.") %
(self.bldev.path,))
- self.grubCB.set_active(not self.dispatch.stepInSkipList("instbootloader"))
+ self.grubCB.set_active(self.dispatch.step_enabled("instbootloader"))
self.grubCB.connect("toggled", self.bootloaderChanged)
hb.pack_start(self.grubCB, False)
diff --git a/pyanaconda/iw/upgrade_bootloader_gui.py b/pyanaconda/iw/upgrade_bootloader_gui.py
index b8bf0c8..7090685 100644
--- a/pyanaconda/iw/upgrade_bootloader_gui.py
+++ b/pyanaconda/iw/upgrade_bootloader_gui.py
@@ -43,12 +43,11 @@ class UpgradeBootloaderWindow (InstallWindow):
self.dispatch.skipStep("bootloader")
self.dispatch.skipStep("instbootloader")
elif self.newbl_radio.get_active():
- self.dispatch.skipStep("bootloader", skip = 0)
- self.dispatch.skipStep("instbootloader", skip = 0)
+ self.dispatch.request_step("bootloader")
self.bl.update_only = False
else:
self.dispatch.skipStep("bootloader")
- self.dispatch.skipStep("instbootloader", skip = 0)
+ self.dispatch.request_step("instbootloader")
self.bl.update_only = self.bl.can_update
self.bl.stage1_device = self.bootDev
@@ -111,9 +110,9 @@ class UpgradeBootloaderWindow (InstallWindow):
else:
default = self.nobl_radio
- if not self.dispatch.stepInSkipList("bootloader"):
+ if self.dispatch.step_enabled("bootloader"):
self.newbl_radio.set_active(True)
- elif self.dispatch.stepInSkipList("instbootloader"):
+ elif self.dispatch.step_disabled("instbootloader"):
self.nobl_radio.set_active(True)
else:
default.set_active(True)
diff --git a/pyanaconda/text.py b/pyanaconda/text.py
index 724f4fb..6e5185f 100644
--- a/pyanaconda/text.py
+++ b/pyanaconda/text.py
@@ -62,11 +62,9 @@ stepToClasses = {
"tasksel": ("task_text", "TaskWindow"),
"install" : ("progress_text", "setupForInstall"),
"complete" : ("complete_text", "FinishedWindow"),
+ "bootloader" : ("zipl_text", ( "ZiplWindow"))
}
-if iutil.isS390():
- stepToClasses["bootloader"] = ("zipl_text", ( "ZiplWindow"))
-
class InstallWindow:
def __call__ (self, screen):
raise RuntimeError, "Unimplemented screen"
@@ -553,8 +551,11 @@ class InstallInterface(InstallInterfaceBase):
continue
def unsupported_steps(self):
- return ["cleardiskssel", "filtertype", "filter", "group-selection",
- "partition"]
+ l = ["cleardiskssel", "filtertype", "filter", "group-selection",
+ "partition"]
+ if not iutil.isS390():
+ l.append("bootloader")
+ return l
def killSelf(screen):
screen.finish()
diff --git a/pyanaconda/textw/upgrade_bootloader_text.py b/pyanaconda/textw/upgrade_bootloader_text.py
index b8c1990..cb3b847 100644
--- a/pyanaconda/textw/upgrade_bootloader_text.py
+++ b/pyanaconda/textw/upgrade_bootloader_text.py
@@ -41,7 +41,7 @@ class UpgradeBootloaderWindow:
update = False
nobl = False
- if anaconda.dispatch.stepInSkipList("instbootloader"):
+ if anaconda.dispatch.step_disabled("instbootloader"):
nobl = True
elif self.type and self.bootDev:
update = True
@@ -85,15 +85,15 @@ class UpgradeBootloaderWindow:
if button == TEXT_BACK_CHECK:
screen.popWindow()
- return INSTALL_BACK
+ return INSTALL_BACK
- if blradio.getSelection() == "nobl":
+ if blradio.getSelection() == "nobl":
self.dispatch.skipStep("bootloader"
self.dispatch.skipStep("instbootloader")
anaconda.bootloader.update_only = False
else:
self.dispatch.skipStep("bootloader")
- self.dispatch.skipStep("instbootloader", skip = 0)
+ self.dispatch.request_step("instbootloader")
anaconda.bootloader.update_only = anaconda.bootloader.can_update
screen.popWindow()
--
1.7.3.3
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
