Follow the same convention as the other dispatcher methods.
---
anaconda | 6 +-
pyanaconda/dispatch.py | 2 +-
pyanaconda/installclass.py | 14 +++---
pyanaconda/iw/autopart_type.py | 8 ++--
pyanaconda/iw/bootloader_main_gui.py | 2 +-
pyanaconda/iw/task_gui.py | 2 +-
pyanaconda/iw/upgrade_bootloader_gui.py | 6 +-
pyanaconda/kickstart.py | 60 +++++++++++++-------------
pyanaconda/textw/partition_text.py | 2 +-
pyanaconda/textw/upgrade_bootloader_text.py | 6 +-
pyanaconda/upgrade.py | 10 ++--
tests/pyanaconda_test/bootloader_test.py | 2 +-
tests/pyanaconda_test/dispatch_test.py | 4 +-
tests/pyanaconda_test/upgrade_test.py | 10 ++--
14 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/anaconda b/anaconda
index 57d376f..21ae8fe 100755
--- a/anaconda
+++ b/anaconda
@@ -787,20 +787,20 @@ if __name__ == "__main__":
if opts.lang:
# this is lame, but make things match what we expect (#443408)
opts.lang = opts.lang.replace(".utf8", ".UTF-8")
- anaconda.dispatch.skipStep("language")
+ anaconda.dispatch.skip_steps("language")
anaconda.instLanguage.instLang = opts.lang
anaconda.instLanguage.buildLocale()
anaconda.instLanguage.systemLang = opts.lang
anaconda.timezone.setTimezoneInfo(anaconda.instLanguage.getDefaultTimeZone(anaconda.rootPath))
if opts.keymap:
- anaconda.dispatch.skipStep("keyboard")
+ anaconda.dispatch.skip_steps("keyboard")
anaconda.keyboard.set(opts.keymap)
anaconda.keyboard.activate()
# set up the headless case
if anaconda.isHeadless:
- anaconda.dispatch.skipStep("keyboard")
+ anaconda.dispatch.skip_steps("keyboard")
try:
anaconda.dispatch.run()
diff --git a/pyanaconda/dispatch.py b/pyanaconda/dispatch.py
index 3970189..9e1c190 100644
--- a/pyanaconda/dispatch.py
+++ b/pyanaconda/dispatch.py
@@ -252,7 +252,7 @@ class Dispatcher(object):
Step.SCHED_REQUESTED,
Step.SCHED_DONE]
- def skipStep(self, *steps):
+ def skip_steps(self, *steps):
map(lambda s: self.steps[s].skip(), steps)
def step_is_direct(self, step):
diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py
index 508f3b3..251d882 100644
--- a/pyanaconda/installclass.py
+++ b/pyanaconda/installclass.py
@@ -124,31 +124,31 @@ class BaseInstallClass(object):
)
if not isBeta:
- dispatch.skipStep("betanag")
+ dispatch.skip_steps("betanag")
if iutil.isEfi() or not iutil.isX86():
- dispatch.skipStep("bootloader")
+ dispatch.skip_steps("bootloader")
# allow backends to disable interactive package selection
if not anaconda.backend.supportsPackageSelection:
- dispatch.skipStep("tasksel")
- dispatch.skipStep("group-selection")
+ dispatch.skip_steps("tasksel")
+ dispatch.skip_steps("group-selection")
# allow install classes to turn off the upgrade
if not self.showUpgrade or not anaconda.backend.supportsUpgrades:
- dispatch.skipStep("findrootparts")
+ dispatch.skip_steps("findrootparts")
# 'noupgrade' can be used on the command line to force not looking
# for partitions to upgrade. useful in some cases...
if flags.cmdline.has_key("noupgrade"):
- dispatch.skipStep("findrootparts")
+ dispatch.skip_steps("findrootparts")
# upgrade will also always force looking for an upgrade.
if flags.cmdline.has_key("upgrade"):
dispatch.request_step("findrootparts")
# allow interface backends to skip certain steps.
- map(lambda s: dispatch.skipStep(s), anaconda.intf.unsupported_steps())
+ map(lambda s: dispatch.skip_steps(s), anaconda.intf.unsupported_steps())
# modifies the uri from installmethod.getMethodUri() to take into
# account any installclass specific things including multiple base
diff --git a/pyanaconda/iw/autopart_type.py b/pyanaconda/iw/autopart_type.py
index 8a02f82..5408949 100644
--- a/pyanaconda/iw/autopart_type.py
+++ b/pyanaconda/iw/autopart_type.py
@@ -160,8 +160,8 @@ class PartitionTypeWindow(InstallWindow):
self.storage.clearPartChoice = self.buttonGroup.getCurrent()
if self.buttonGroup.getCurrent() == "custom":
- self.dispatch.skipStep("autopartitionexecute")
- self.dispatch.skipStep("cleardiskssel")
+ self.dispatch.skip_steps("autopartitionexecute")
+ self.dispatch.skip_steps("cleardiskssel")
self.dispatch.request_step("partition")
self.dispatch.request_step("bootloader")
@@ -200,8 +200,8 @@ class PartitionTypeWindow(InstallWindow):
self.dispatch.request_step("partition")
self.dispatch.request_step("bootloader")
else:
- self.dispatch.skipStep("partition")
- self.dispatch.skipStep("bootloader")
+ self.dispatch.skip_steps("partition")
+ self.dispatch.skip_steps("bootloader")
return None
diff --git a/pyanaconda/iw/bootloader_main_gui.py b/pyanaconda/iw/bootloader_main_gui.py
index cee1a1c..882127f 100644
--- a/pyanaconda/iw/bootloader_main_gui.py
+++ b/pyanaconda/iw/bootloader_main_gui.py
@@ -53,7 +53,7 @@ class MainBootloaderWindow(InstallWindow):
if not self.grubCB.get_active():
# if we're not installing a boot loader, don't show the second
# screen and don't worry about other options
- self.dispatch.skipStep("instbootloader")
+ self.dispatch.skip_steps("instbootloader")
return
else:
self.dispatch.request_step("instbootloader")
diff --git a/pyanaconda/iw/task_gui.py b/pyanaconda/iw/task_gui.py
index 6764dcf..e47df38 100644
--- a/pyanaconda/iw/task_gui.py
+++ b/pyanaconda/iw/task_gui.py
@@ -507,7 +507,7 @@ class TaskWindow(InstallWindow):
if self.xml.get_widget("customRadio").get_active():
self.dispatch.request_step("group-selection")
else:
- self.dispatch.skipStep("group-selection")
+ self.dispatch.skip_steps("group-selection")
tasks = self.xml.get_widget("taskList").get_model()
for (cb, task, grps) in filter(lambda x: not x[0], tasks):
diff --git a/pyanaconda/iw/upgrade_bootloader_gui.py b/pyanaconda/iw/upgrade_bootloader_gui.py
index 7090685..5bdad32 100644
--- a/pyanaconda/iw/upgrade_bootloader_gui.py
+++ b/pyanaconda/iw/upgrade_bootloader_gui.py
@@ -40,13 +40,13 @@ class UpgradeBootloaderWindow (InstallWindow):
def getNext(self):
if self.nobl_radio.get_active():
- self.dispatch.skipStep("bootloader")
- self.dispatch.skipStep("instbootloader")
+ self.dispatch.skip_steps("bootloader")
+ self.dispatch.skip_steps("instbootloader")
elif self.newbl_radio.get_active():
self.dispatch.request_step("bootloader")
self.bl.update_only = False
else:
- self.dispatch.skipStep("bootloader")
+ self.dispatch.skip_steps("bootloader")
self.dispatch.request_step("instbootloader")
self.bl.update_only = self.bl.can_update
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 72af6e4..d192901 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -226,7 +226,7 @@ class AutoPart(commands.autopart.F12_AutoPart):
self.anaconda.storage.autoPartAddBackupPassphrase = \
self.backuppassphrase
- self.anaconda.dispatch.skipStep("partition", "parttype")
+ self.anaconda.dispatch.skip_steps("partition", "parttype")
class AutoStep(commands.autostep.FC3_AutoStep):
def execute(self):
@@ -249,7 +249,7 @@ class Bootloader(commands.bootloader.F15_Bootloader):
self.anaconda.bootloader.update_only = True
if location is None:
- self.anaconda.dispatch.skipStep("instbootloader")
+ self.anaconda.dispatch.skip_steps("instbootloader")
else:
if self.appendLine:
args = self.appendLine.split()
@@ -274,7 +274,7 @@ class Bootloader(commands.bootloader.F15_Bootloader):
self.anaconda.bootloader.drive_order = self.driveorder
- self.anaconda.dispatch.skipStep("upgbootloader", "bootloader")
+ self.anaconda.dispatch.skip_steps("upgbootloader", "bootloader")
class ClearPart(commands.clearpart.FC3_ClearPart):
def parse(self, args):
@@ -304,7 +304,7 @@ class ClearPart(commands.clearpart.FC3_ClearPart):
self.anaconda.storage.config.reinitializeDisks = self.initAll
clearPartitions(self.anaconda.storage)
- self.anaconda.dispatch.skipStep("cleardiskssel")
+ self.anaconda.dispatch.skip_steps("cleardiskssel")
class Fcoe(commands.fcoe.F13_Fcoe):
def parse(self, args):
@@ -402,14 +402,14 @@ class Keyboard(commands.keyboard.FC3_Keyboard):
def execute(self):
self.anaconda.keyboard.set(self.keyboard)
self.anaconda.keyboard.beenset = 1
- self.anaconda.dispatch.skipStep("keyboard")
+ self.anaconda.dispatch.skip_steps("keyboard")
class Lang(commands.lang.FC3_Lang):
def execute(self):
self.anaconda.instLanguage.instLang = self.lang
self.anaconda.instLanguage.systemLang = self.lang
self.anaconda.instLanguage.buildLocale()
- self.anaconda.dispatch.skipStep("language")
+ self.anaconda.dispatch.skip_steps("language")
class LogVolData(commands.logvol.F15_LogVolData):
def execute(self):
@@ -451,7 +451,7 @@ class LogVolData(commands.logvol.F15_LogVolData):
dev.format.mountpoint = self.mountpoint
dev.format.mountopts = self.fsopts
- self.anaconda.dispatch.skipStep("partition", "parttype")
+ self.anaconda.dispatch.skip_steps("partition", "parttype")
return
# Make sure this LV name is not already used in the requested VG.
@@ -534,7 +534,7 @@ class LogVolData(commands.logvol.F15_LogVolData):
parents=request)
storage.createDevice(luksdev)
- self.anaconda.dispatch.skipStep("partition", "parttype")
+ self.anaconda.dispatch.skip_steps("partition", "parttype")
class Logging(commands.logging.FC6_Logging):
def execute(self):
@@ -759,7 +759,7 @@ class PartitionData(commands.partition.F12_PartData):
dev.format.mountpoint = self.mountpoint
dev.format.mountopts = self.fsopts
- self.anaconda.dispatch.skipStep("partition", "parttype")
+ self.anaconda.dispatch.skip_steps("partition", "parttype")
return
# Now get a format to hold a lot of these extra values.
@@ -848,11 +848,11 @@ class PartitionData(commands.partition.F12_PartData):
parents=request)
storage.createDevice(luksdev)
- self.anaconda.dispatch.skipStep("partition", "parttype")
+ self.anaconda.dispatch.skip_steps("partition", "parttype")
class Reboot(commands.reboot.FC6_Reboot):
def execute(self):
- self.anaconda.dispatch.skipStep("complete")
+ self.anaconda.dispatch.skip_steps("complete")
class RaidData(commands.raid.F15_RaidData):
def execute(self):
@@ -901,7 +901,7 @@ class RaidData(commands.raid.F15_RaidData):
dev.format.mountpoint = self.mountpoint
dev.format.mountopts = self.fsopts
- self.anaconda.dispatch.skipStep("partition", "parttype")
+ self.anaconda.dispatch.skip_steps("partition", "parttype")
return
# Get a list of all the RAID members.
@@ -994,14 +994,14 @@ class RaidData(commands.raid.F15_RaidData):
parents=request)
storage.createDevice(luksdev)
- self.anaconda.dispath.skipStep("partition", "parttype")
+ self.anaconda.dispath.skip_steps("partition", "parttype")
class RootPw(commands.rootpw.F8_RootPw):
def execute(self):
self.anaconda.users.rootPassword["password"] = self.password
self.anaconda.users.rootPassword["isCrypted"] = self.isCrypted
self.anaconda.users.rootPassword["lock"] = self.lock
- self.anaconda.dispatch.skipStep("accounts")
+ self.anaconda.dispatch.skip_steps("accounts")
class SELinux(commands.selinux.FC3_SELinux):
def execute(self):
@@ -1021,7 +1021,7 @@ class Timezone(commands.timezone.FC6_Timezone):
log.warning("Timezone %s set in kickstart is not valid." % (self.timezone,))
self.anaconda.timezone.setTimezoneInfo(self.timezone, self.isUtc)
- self.anaconda.dispatch.skipStep("timezone")
+ self.anaconda.dispatch.skip_steps("timezone")
class Upgrade(commands.upgrade.F11_Upgrade):
def execute(self):
@@ -1461,40 +1461,40 @@ def setSteps(anaconda):
upgrade.setSteps(anaconda)
# we have no way to specify migrating yet
- dispatch.skipStep("upgrademigfind")
- dispatch.skipStep("upgrademigratefs")
- dispatch.skipStep("upgradecontinue")
- dispatch.skipStep("findinstall")
- dispatch.skipStep("language")
- dispatch.skipStep("keyboard")
- dispatch.skipStep("betanag")
+ dispatch.skip_steps("upgrademigfind")
+ dispatch.skip_steps("upgrademigratefs")
+ dispatch.skip_steps("upgradecontinue")
+ dispatch.skip_steps("findinstall")
+ dispatch.skip_steps("language")
+ dispatch.skip_steps("keyboard")
+ dispatch.skip_steps("betanag")
else:
anaconda.instClass.setSteps(anaconda)
- dispatch.skipStep("findrootparts")
+ dispatch.skip_steps("findrootparts")
dispatch.request_step("kickstart")
- dispatch.skipStep("betanag")
- dispatch.skipStep("network")
+ dispatch.skip_steps("betanag")
+ dispatch.skip_steps("network")
# Storage is initialized for us right when kickstart processing starts.
- dispatch.skipStep("storageinit")
+ dispatch.skip_steps("storageinit")
# Make sure to automatically reboot if told to.
if ksdata.reboot.action in [KS_REBOOT, KS_SHUTDOWN]:
- dispatch.skipStep("complete")
+ dispatch.skip_steps("complete")
# If the package section included anything, skip group selection.
if ksdata.upgrade.upgrade:
- dispatch.skipStep("tasksel", "group-selection")
+ dispatch.skip_steps("tasksel", "group-selection")
# Special check for this, since it doesn't make any sense.
if ksdata.packages.seen:
warnings.warn("Ignoring contents of %packages section due to upgrade.")
elif havePackages(ksdata.packages):
- dispatch.skipStep("tasksel", "group-selection")
+ dispatch.skip_steps("tasksel", "group-selection")
else:
if ksdata.packages.seen:
- dispatch.skipStep("tasksel", "group-selection")
+ dispatch.skip_steps("tasksel", "group-selection")
else:
dispatch.request_step("tasksel", "group-selection")
diff --git a/pyanaconda/textw/partition_text.py b/pyanaconda/textw/partition_text.py
index b1d9d74..67be4ab 100644
--- a/pyanaconda/textw/partition_text.py
+++ b/pyanaconda/textw/partition_text.py
@@ -149,7 +149,7 @@ class PartitionTypeWindow:
anaconda.storage.config.clearPartDisks = sel
break
- anaconda.dispatch.skipStep("bootloader")
+ anaconda.dispatch.skip_steps("bootloader")
return INSTALL_OK
diff --git a/pyanaconda/textw/upgrade_bootloader_text.py b/pyanaconda/textw/upgrade_bootloader_text.py
index cb3b847..abee1aa 100644
--- a/pyanaconda/textw/upgrade_bootloader_text.py
+++ b/pyanaconda/textw/upgrade_bootloader_text.py
@@ -88,11 +88,11 @@ class UpgradeBootloaderWindow:
return INSTALL_BACK
if blradio.getSelection() == "nobl":
- self.dispatch.skipStep("bootloader"
- self.dispatch.skipStep("instbootloader")
+ self.dispatch.skip_steps("bootloader"
+ self.dispatch.skip_steps("instbootloader")
anaconda.bootloader.update_only = False
else:
- self.dispatch.skipStep("bootloader")
+ self.dispatch.skip_steps("bootloader")
self.dispatch.request_step("instbootloader")
anaconda.bootloader.update_only = anaconda.bootloader.can_update
diff --git a/pyanaconda/upgrade.py b/pyanaconda/upgrade.py
index 30cdf6e..6bf2ff4 100644
--- a/pyanaconda/upgrade.py
+++ b/pyanaconda/upgrade.py
@@ -104,7 +104,7 @@ def findRootParts(anaconda):
if anaconda.rootParts is not None and len(anaconda.rootParts) > 0:
anaconda.dispatch.request_step("findinstall")
else:
- anaconda.dispatch.skipStep("findinstall")
+ anaconda.dispatch.skip_steps("findinstall")
def bindMountDevDirectory(instPath):
getFormat("bind",
@@ -116,7 +116,7 @@ def bindMountDevDirectory(instPath):
def upgradeMigrateFind(anaconda):
migents = anaconda.storage.migratableDevices
if not migents or len(migents) < 1:
- anaconda.dispatch.skipStep("upgrademigratefs")
+ anaconda.dispatch.skip_steps("upgrademigratefs")
else:
anaconda.dispatch.request_step("upgrademigratefs")
@@ -291,9 +291,9 @@ def setSteps(anaconda):
)
if not iutil.isX86() and not iutil.isS390():
- dispatch.skipStep("bootloader")
+ dispatch.skip_steps("bootloader")
if not iutil.isX86():
- dispatch.skipStep("upgbootloader")
+ dispatch.skip_steps("upgbootloader")
- dispatch.skipStep("cleardiskssel")
+ dispatch.skip_steps("cleardiskssel")
diff --git a/tests/pyanaconda_test/bootloader_test.py b/tests/pyanaconda_test/bootloader_test.py
index 57fff1b..6030caf 100644
--- a/tests/pyanaconda_test/bootloader_test.py
+++ b/tests/pyanaconda_test/bootloader_test.py
@@ -103,7 +103,7 @@ class BootloaderTest(mock.TestCase):
methods = [x[0] for x in anaconda.method_calls]
self.assertEqual(methods,
['bootloader.updateDriveList', 'platform.bootloaderChoices', \
- 'dispatch.skipStep', 'bootloader.images.setup', 'bootloader.setDevice']
+ 'dispatch.skip_steps', 'bootloader.images.setup', 'bootloader.setDevice']
)
def fixed_mdraid_grub_target_1_test(self):
diff --git a/tests/pyanaconda_test/dispatch_test.py b/tests/pyanaconda_test/dispatch_test.py
index 485ddde..afb2e88 100644
--- a/tests/pyanaconda_test/dispatch_test.py
+++ b/tests/pyanaconda_test/dispatch_test.py
@@ -106,7 +106,7 @@ class DispatchTest(mock.TestCase):
d.done_steps("betanag")
self.assertTrue(d.step_enabled("betanag"))
self.assertTrue(d.steps["betanag"], Step.SCHED_DONE)
- self.assertRaises(DispatchError, d.skipStep, "betanag")
+ self.assertRaises(DispatchError, d.skip_steps, "betanag")
def instantiation_test(self):
from pyanaconda.dispatch import Dispatcher
@@ -127,7 +127,7 @@ class DispatchTest(mock.TestCase):
d = self._getDispatcher()
d.schedule_steps("betanag", "filtertype", "complete")
self.assertTrue(d.step_enabled("betanag"))
- d.skipStep("betanag", "complete")
+ d.skip_steps("betanag", "complete")
self.assertFalse(d.step_enabled("betanag"))
self.assertFalse(d.step_enabled("complete"))
self.assertTrue(d.step_enabled("filtertype"))
diff --git a/tests/pyanaconda_test/upgrade_test.py b/tests/pyanaconda_test/upgrade_test.py
index d694afb..2cca62f 100644
--- a/tests/pyanaconda_test/upgrade_test.py
+++ b/tests/pyanaconda_test/upgrade_test.py
@@ -79,7 +79,7 @@ class UpgradeTest(mock.TestCase):
pyanaconda.upgrade.findRootParts(anaconda)
self.assertTrue(anaconda.intf.messageWindow.called)
- self.assertEqual(anaconda.dispatch.skipStep.call_args,
+ self.assertEqual(anaconda.dispatch.skip_steps.call_args,
(('findinstall',), {'skip': 1}))
def find_root_parts_2_test(self):
@@ -93,7 +93,7 @@ class UpgradeTest(mock.TestCase):
pyanaconda.upgrade.findRootParts(anaconda)
self.assertFalse(anaconda.intf.messageWindow.called)
- self.assertEqual(anaconda.dispatch.skipStep.call_args,
+ self.assertEqual(anaconda.dispatch.skip_steps.call_args,
(('findinstall',), {'skip': 0}))
def bind_mount_dev_directory_test(self):
@@ -109,7 +109,7 @@ class UpgradeTest(mock.TestCase):
anaconda = mock.Mock()
anaconda.storage.migratableDevices = []
pyanaconda.upgrade.upgradeMigrateFind(anaconda)
- self.assertEqual(anaconda.dispatch.skipStep.call_args,
+ self.assertEqual(anaconda.dispatch.skip_steps.call_args,
(('upgrademigratefs',), {}))
def upgrade_migrate_find_2_test(self):
@@ -117,7 +117,7 @@ class UpgradeTest(mock.TestCase):
anaconda = mock.Mock()
anaconda.storage.migratableDevices = ['']
pyanaconda.upgrade.upgradeMigrateFind(anaconda)
- self.assertEqual(anaconda.dispatch.skipStep.call_args,
+ self.assertEqual(anaconda.dispatch.skip_steps.call_args,
(('upgrademigratefs',), {'skip': 0}))
def copy_from_sysimage_1_test(self):
@@ -239,6 +239,6 @@ class UpgradeTest(mock.TestCase):
anaconda = mock.Mock()
pyanaconda.upgrade.setSteps(anaconda)
- self.assertEqual(anaconda.dispatch.skipStep.call_args_list,
+ self.assertEqual(anaconda.dispatch.skip_steps.call_args_list,
[(('bootloader',), {}), (('upgbootloader',), {})])
--
1.7.3.3
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
