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

[master 1/5] logging: remove references to some more steps.



those are: bootdisk, setsanex, videocard, xcustom. originally removed in
2005, see 29652eef53cec2fc6e8d13917af5f2f1110499b3.

Also report the correct nonexistent step in dispatch.py.
---
 dispatch.py  |    3 +--
 kickstart.py |    6 ------
 2 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/dispatch.py b/dispatch.py
index 2f3d787..b01b1d8 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -177,8 +177,7 @@ class Dispatcher(object):
                         del self.skipSteps[name]
                 return
 
-        #raise KeyError, ("unknown step %s" % stepToSkip)
-        log.warning("step %s does not exist", name)
+        log.warning("step %s does not exist", stepToSkip)
 
     def stepIsDirect(self, step):
         """Takes a step number"""
diff --git a/kickstart.py b/kickstart.py
index cd5d82c..07f23a4 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -961,8 +961,6 @@ class SELinux(commands.selinux.FC3_SELinux):
 
 class SkipX(commands.skipx.FC3_SkipX):
     def execute(self, anaconda):
-        anaconda.ksdata.skipSteps.extend(["setsanex", "videocard", "xcustom"])
-
         if anaconda.desktop is not None:
             anaconda.desktop.setDefaultRunLevel(3)
 
@@ -1420,10 +1418,6 @@ def setSteps(anaconda):
         anaconda.instClass.setSteps(anaconda)
         dispatch.skipStep("findrootparts")
 
-    if interactive or flags.autostep:
-        dispatch.skipStep("bootdisk")
-
-    dispatch.skipStep("bootdisk")
     dispatch.skipStep("betanag")
     dispatch.skipStep("network")
 
-- 
1.6.6


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