[master 13/15] cosmetic: dispatch.request_step is dispatch.request_steps.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Follow the same convention as the other dispatcher methods.
---
 pyanaconda/dispatch.py                      |    2 +-
 pyanaconda/installclass.py                  |    2 +-
 pyanaconda/iw/autopart_type.py              |   12 ++++++------
 pyanaconda/iw/bootloader_main_gui.py        |    2 +-
 pyanaconda/iw/task_gui.py                   |    2 +-
 pyanaconda/iw/upgrade_bootloader_gui.py     |    4 ++--
 pyanaconda/kickstart.py                     |    4 ++--
 pyanaconda/textw/partition_text.py          |    2 +-
 pyanaconda/textw/upgrade_bootloader_text.py |    2 +-
 pyanaconda/upgrade.py                       |    4 ++--
 10 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pyanaconda/dispatch.py b/pyanaconda/dispatch.py
index 9e1c190..ed943d5 100644
--- a/pyanaconda/dispatch.py
+++ b/pyanaconda/dispatch.py
@@ -230,7 +230,7 @@ class Dispatcher(object):
             i -= 1
         return False
 
-    def request_step(self, *steps):
+    def request_steps(self, *steps):
         map(lambda s: self.steps[s].request(), steps)
 
     def run(self):
diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py
index 251d882..0819b6b 100644
--- a/pyanaconda/installclass.py
+++ b/pyanaconda/installclass.py
@@ -145,7 +145,7 @@ class BaseInstallClass(object):
 
         # upgrade will also always force looking for an upgrade.
         if flags.cmdline.has_key("upgrade"):
-            dispatch.request_step("findrootparts")
+            dispatch.request_steps("findrootparts")
 
         # allow interface backends to skip certain steps.
         map(lambda s: dispatch.skip_steps(s), anaconda.intf.unsupported_steps())
diff --git a/pyanaconda/iw/autopart_type.py b/pyanaconda/iw/autopart_type.py
index 5408949..8a305c3 100644
--- a/pyanaconda/iw/autopart_type.py
+++ b/pyanaconda/iw/autopart_type.py
@@ -162,8 +162,8 @@ class PartitionTypeWindow(InstallWindow):
         if self.buttonGroup.getCurrent() == "custom":
             self.dispatch.skip_steps("autopartitionexecute")
             self.dispatch.skip_steps("cleardiskssel")
-            self.dispatch.request_step("partition")
-            self.dispatch.request_step("bootloader")
+            self.dispatch.request_steps("partition")
+            self.dispatch.request_steps("bootloader")
 
             self.storage.config.clearPartType = CLEARPART_TYPE_NONE
         else:
@@ -184,8 +184,8 @@ class PartitionTypeWindow(InstallWindow):
             elif self.buttonGroup.getCurrent() == "freespace":
                 self.storage.config.clearPartType = CLEARPART_TYPE_NONE
 
-            self.dispatch.request_step("autopartitionexecute")
-            self.dispatch.request_step("cleardiskssel")
+            self.dispatch.request_steps("autopartitionexecute")
+            self.dispatch.request_steps("cleardiskssel")
 
             if self.encryptButton.get_active():
                 self.storage.encryptedAutoPart = True
@@ -197,8 +197,8 @@ class PartitionTypeWindow(InstallWindow):
             self.storage.doAutoPart = True
 
             if self.reviewButton.get_active():
-                self.dispatch.request_step("partition")
-                self.dispatch.request_step("bootloader")
+                self.dispatch.request_steps("partition")
+                self.dispatch.request_steps("bootloader")
             else:
                 self.dispatch.skip_steps("partition")
                 self.dispatch.skip_steps("bootloader")
diff --git a/pyanaconda/iw/bootloader_main_gui.py b/pyanaconda/iw/bootloader_main_gui.py
index 882127f..e6f5c4f 100644
--- a/pyanaconda/iw/bootloader_main_gui.py
+++ b/pyanaconda/iw/bootloader_main_gui.py
@@ -56,7 +56,7 @@ class MainBootloaderWindow(InstallWindow):
             self.dispatch.skip_steps("instbootloader")
             return
         else:
-            self.dispatch.request_step("instbootloader")
+            self.dispatch.request_steps("instbootloader")
 
         # set the password
         self.bl.password = self.blpass.getPassword()
diff --git a/pyanaconda/iw/task_gui.py b/pyanaconda/iw/task_gui.py
index e47df38..55ee59b 100644
--- a/pyanaconda/iw/task_gui.py
+++ b/pyanaconda/iw/task_gui.py
@@ -505,7 +505,7 @@ class TaskWindow(InstallWindow):
             raise gui.StayOnScreen
 
         if self.xml.get_widget("customRadio").get_active():
-            self.dispatch.request_step("group-selection")
+            self.dispatch.request_steps("group-selection")
         else:
             self.dispatch.skip_steps("group-selection")
 
diff --git a/pyanaconda/iw/upgrade_bootloader_gui.py b/pyanaconda/iw/upgrade_bootloader_gui.py
index 5bdad32..a9c4c4c 100644
--- a/pyanaconda/iw/upgrade_bootloader_gui.py
+++ b/pyanaconda/iw/upgrade_bootloader_gui.py
@@ -43,11 +43,11 @@ class UpgradeBootloaderWindow (InstallWindow):
             self.dispatch.skip_steps("bootloader")
             self.dispatch.skip_steps("instbootloader")
         elif self.newbl_radio.get_active():
-            self.dispatch.request_step("bootloader")
+            self.dispatch.request_steps("bootloader")
             self.bl.update_only = False
         else:
             self.dispatch.skip_steps("bootloader")
-            self.dispatch.request_step("instbootloader")
+            self.dispatch.request_steps("instbootloader")
             self.bl.update_only = self.bl.can_update
 
             self.bl.stage1_device = self.bootDev
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index d192901..b97553a 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -1471,7 +1471,7 @@ def setSteps(anaconda):
     else:
         anaconda.instClass.setSteps(anaconda)
         dispatch.skip_steps("findrootparts")
-    dispatch.request_step("kickstart")
+    dispatch.request_steps("kickstart")
 
     dispatch.skip_steps("betanag")
     dispatch.skip_steps("network")
@@ -1496,7 +1496,7 @@ def setSteps(anaconda):
         if ksdata.packages.seen:
             dispatch.skip_steps("tasksel", "group-selection")
         else:
-            dispatch.request_step("tasksel", "group-selection")
+            dispatch.request_steps("tasksel", "group-selection")
 
     if ksdata.ignoredisk.interactive:
         dispatch.request_steps("filtertype", "filter")
diff --git a/pyanaconda/textw/partition_text.py b/pyanaconda/textw/partition_text.py
index 67be4ab..a5bef7b 100644
--- a/pyanaconda/textw/partition_text.py
+++ b/pyanaconda/textw/partition_text.py
@@ -143,7 +143,7 @@ class PartitionTypeWindow:
                 mustHaveSelectedDrive(anaconda.intf)
                 continue
 
-            anaconda.dispatch.request_step("autopartitionexecute")
+            anaconda.dispatch.request_steps("autopartitionexecute")
             anaconda.storage.doAutoPart = True
             anaconda.storage.config.clearPartType = partmethod_ans
             anaconda.storage.config.clearPartDisks = sel
diff --git a/pyanaconda/textw/upgrade_bootloader_text.py b/pyanaconda/textw/upgrade_bootloader_text.py
index abee1aa..632551a 100644
--- a/pyanaconda/textw/upgrade_bootloader_text.py
+++ b/pyanaconda/textw/upgrade_bootloader_text.py
@@ -93,7 +93,7 @@ class UpgradeBootloaderWindow:
                 anaconda.bootloader.update_only = False
             else:
                 self.dispatch.skip_steps("bootloader")
-                self.dispatch.request_step("instbootloader")
+                self.dispatch.request_steps("instbootloader")
                 anaconda.bootloader.update_only = anaconda.bootloader.can_update
 
             screen.popWindow()
diff --git a/pyanaconda/upgrade.py b/pyanaconda/upgrade.py
index 6bf2ff4..886c2bf 100644
--- a/pyanaconda/upgrade.py
+++ b/pyanaconda/upgrade.py
@@ -102,7 +102,7 @@ def findRootParts(anaconda):
     setUpgradeRoot(anaconda)
 
     if anaconda.rootParts is not None and len(anaconda.rootParts) > 0:
-        anaconda.dispatch.request_step("findinstall")
+        anaconda.dispatch.request_steps("findinstall")
     else:
         anaconda.dispatch.skip_steps("findinstall")
 
@@ -118,7 +118,7 @@ def upgradeMigrateFind(anaconda):
     if not migents or len(migents) < 1:
         anaconda.dispatch.skip_steps("upgrademigratefs")
     else:
-        anaconda.dispatch.request_step("upgrademigratefs")
+        anaconda.dispatch.request_steps("upgrademigratefs")
 
 def copyFromSysimage(rootPath, filename):
     """Mirrors filename from the sysimage on the ramdisk."""
-- 
1.7.3.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux