[master 05/15] dispatch: All skips are permanent now.

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

 



That means skipStep("step", permanent=1) is redundant. Also, since the new
dispatch interface does not support it, remove the skip=1 argument.
---
 anaconda                                    |    6 +++---
 pyanaconda/installclass.py                  |   12 ++++++------
 pyanaconda/iw/autopart_type.py              |    4 ++--
 pyanaconda/iw/bootloader_main_gui.py        |    2 +-
 pyanaconda/iw/task_gui.py                   |    2 +-
 pyanaconda/iw/upgrade_bootloader_gui.py     |    6 +++---
 pyanaconda/iw/upgrade_swap_gui.py           |    2 +-
 pyanaconda/kickstart.py                     |    4 ++--
 pyanaconda/textw/partition_text.py          |    4 ++--
 pyanaconda/textw/upgrade_bootloader_text.py |    6 +++---
 pyanaconda/textw/upgrade_text.py            |    2 +-
 pyanaconda/upgrade.py                       |    6 +++---
 12 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/anaconda b/anaconda
index 70dd717..16f5238 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", permanent = 1)
+        anaconda.dispatch.skipStep("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", permanent = 1)
+        anaconda.dispatch.skipStep("keyboard")
         anaconda.keyboard.set(opts.keymap)
         anaconda.keyboard.activate()
 
     # set up the headless case
     if anaconda.isHeadless:
-        anaconda.dispatch.skipStep("keyboard", permanent = 1)
+        anaconda.dispatch.skipStep("keyboard")
 
     try:
         anaconda.dispatch.run()
diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py
index fcd3f14..ac21f69 100644
--- a/pyanaconda/installclass.py
+++ b/pyanaconda/installclass.py
@@ -125,24 +125,24 @@ class BaseInstallClass(object):
 		)
 
 	if not isBeta:
-	    dispatch.skipStep("betanag", permanent=1)
+	    dispatch.skipStep("betanag")
 
         if iutil.isEfi() or not iutil.isX86():
-            dispatch.skipStep("bootloader", permanent=1)
+            dispatch.skipStep("bootloader")
 
         # allow backends to disable interactive package selection
         if not anaconda.backend.supportsPackageSelection:
-            dispatch.skipStep("tasksel", skip = 1, permanent=1)
-            dispatch.skipStep("group-selection", skip = 1, permanent=1)
+            dispatch.skipStep("tasksel")
+            dispatch.skipStep("group-selection")
 
         # allow install classes to turn off the upgrade
         if not self.showUpgrade or not anaconda.backend.supportsUpgrades:
-            dispatch.skipStep("findrootparts", skip = 1)
+            dispatch.skipStep("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", skip = 1)
+            dispatch.skipStep("findrootparts")
 
         # upgrade will also always force looking for an upgrade.
         if flags.cmdline.has_key("upgrade"):
diff --git a/pyanaconda/iw/autopart_type.py b/pyanaconda/iw/autopart_type.py
index 8d22a80..e16a827 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", skip = 1)
-            self.dispatch.skipStep("cleardiskssel", skip = 1)
+            self.dispatch.skipStep("autopartitionexecute")
+            self.dispatch.skipStep("cleardiskssel")
             self.dispatch.skipStep("partition", skip = 0)
             self.dispatch.skipStep("bootloader", skip = 0)
 
diff --git a/pyanaconda/iw/bootloader_main_gui.py b/pyanaconda/iw/bootloader_main_gui.py
index 29d88cc..2eed717 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", skip = 1)
+            self.dispatch.skipStep("instbootloader")
             return
         else:
             self.dispatch.skipStep("instbootloader", skip = 0)
diff --git a/pyanaconda/iw/task_gui.py b/pyanaconda/iw/task_gui.py
index a5e67dd..74b4deb 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.skipStep("group-selection", skip = 0)
         else:
-            self.dispatch.skipStep("group-selection", skip = 1)
+            self.dispatch.skipStep("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 d9aa335..b8bf0c8 100644
--- a/pyanaconda/iw/upgrade_bootloader_gui.py
+++ b/pyanaconda/iw/upgrade_bootloader_gui.py
@@ -40,14 +40,14 @@ class UpgradeBootloaderWindow (InstallWindow):
 
     def getNext(self):
         if self.nobl_radio.get_active():
-            self.dispatch.skipStep("bootloader", skip = 1)
-            self.dispatch.skipStep("instbootloader", skip = 1)
+            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.bl.update_only = False
         else:
-            self.dispatch.skipStep("bootloader", skip = 1)
+            self.dispatch.skipStep("bootloader")
             self.dispatch.skipStep("instbootloader", skip = 0)
             self.bl.update_only = self.bl.can_update
 
diff --git a/pyanaconda/iw/upgrade_swap_gui.py b/pyanaconda/iw/upgrade_swap_gui.py
index a8a1e16..ba9e557 100644
--- a/pyanaconda/iw/upgrade_swap_gui.py
+++ b/pyanaconda/iw/upgrade_swap_gui.py
@@ -66,7 +66,7 @@ class UpgradeSwapWindow (InstallWindow):
 
         else:
             self.storage.createSwapFile(dev, val)
-            self.dispatch.skipStep("addswap", 1)
+            self.dispatch.skipStep("addswap")
                 
         return None
 
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index f3850de..074180e 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -1204,7 +1204,7 @@ class AnacondaKSHandler(superclass):
         for n in self.skipSteps:
             self.anaconda.dispatch.skipStep(n)
         for n in self.permanentSkipSteps:
-            self.anaconda.dispatch.skipStep(n, permanent=1)
+            self.anaconda.dispatch.skipStep(n)
         for n in self.showSteps:
             self.anaconda.dispatch.skipStep(n, skip = 0)
 
@@ -1484,7 +1484,7 @@ def setSteps(anaconda):
         dispatch.skipStep("upgrademigfind")
         dispatch.skipStep("upgrademigratefs")
         dispatch.skipStep("upgradecontinue")
-        dispatch.skipStep("findinstall", permanent = 1)
+        dispatch.skipStep("findinstall")
         dispatch.skipStep("language")
         dispatch.skipStep("keyboard")
         dispatch.skipStep("betanag")
diff --git a/pyanaconda/textw/partition_text.py b/pyanaconda/textw/partition_text.py
index 8a51e05..90a7063 100644
--- a/pyanaconda/textw/partition_text.py
+++ b/pyanaconda/textw/partition_text.py
@@ -150,8 +150,8 @@ class PartitionTypeWindow:
             break
 
         # ask to review autopartition layout - but only if it's not custom partitioning
-        anaconda.dispatch.skipStep("partition", skip = 1)
-        anaconda.dispatch.skipStep("bootloader", skip = 1)
+        anaconda.dispatch.skipStep("partition")
+        anaconda.dispatch.skipStep("bootloader")
 
         return INSTALL_OK
 
diff --git a/pyanaconda/textw/upgrade_bootloader_text.py b/pyanaconda/textw/upgrade_bootloader_text.py
index 7af4600..b8c1990 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", skip = 1)
-                self.dispatch.skipStep("instbootloader", skip = 1)
+                self.dispatch.skipStep("bootloader"
+                self.dispatch.skipStep("instbootloader")
                 anaconda.bootloader.update_only = False
             else:
-                self.dispatch.skipStep("bootloader", skip = 1)
+                self.dispatch.skipStep("bootloader")
                 self.dispatch.skipStep("instbootloader", skip = 0)
                 anaconda.bootloader.update_only = anaconda.bootloader.can_update
 
diff --git a/pyanaconda/textw/upgrade_text.py b/pyanaconda/textw/upgrade_text.py
index 504172b..e7683b2 100644
--- a/pyanaconda/textw/upgrade_text.py
+++ b/pyanaconda/textw/upgrade_text.py
@@ -201,7 +201,7 @@ class UpgradeSwapWindow:
 		else:
 		    screen.popWindow()
                     anaconda.storage.createSwapFile(dev, val)
-                    anaconda.dispatch.skipStep("addswap", 1)
+                    anaconda.dispatch.skipStep("addswap")
 		    return INSTALL_OK
 
 	raise ValueError
diff --git a/pyanaconda/upgrade.py b/pyanaconda/upgrade.py
index 2b96eb5..9fe8175 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.skipStep("findinstall", skip = 0)
     else:
-        anaconda.dispatch.skipStep("findinstall", skip = 1)
+        anaconda.dispatch.skipStep("findinstall")
 
 def bindMountDevDirectory(instPath):
     getFormat("bind",
@@ -170,7 +170,7 @@ def upgradeSwapSuggestion(anaconda):
 
     anaconda.dispatch.skipStep("addswap", 0)
     if suggestedMin <= swap:
-        anaconda.dispatch.skipStep("addswap", permanent=1)
+        anaconda.dispatch.skipStep("addswap")
         return None
 
     fsList = []
@@ -326,4 +326,4 @@ def setSteps(anaconda):
     if not iutil.isX86():
         dispatch.skipStep("upgbootloader")
 
-    dispatch.skipStep("cleardiskssel", permanent=1)
+    dispatch.skipStep("cleardiskssel")
-- 
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