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

Re: [master 1/5] logging: remove all references to the "installtype" step.



-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ack to all 5.

On Wed, 12 May 2010, Ales Kozumplik wrote:

it has been virtually nonexistent for three years, see
9e1a444c46abcfc29c2e44ffd102fcc1eda6289e,
2d90bc12dcc682a7f0ff68e599cbb81a34a0b4a3 and
076c853f50c10203b45a552735f692b13a191bcb.

I found out about this when auditing the rawhide logs today.
---
installclass.py       |    6 ------
iw/examine_gui.py     |    4 +---
kickstart.py          |    3 ---
textw/upgrade_text.py |    4 +---
upgrade.py            |    4 ----
5 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/installclass.py b/installclass.py
index 2e8fcf6..7208a7f 100644
--- a/installclass.py
+++ b/installclass.py
@@ -84,7 +84,6 @@ class BaseInstallClass(object):
                 "storageinit",
                 "findrootparts",
		 "betanag",
-		 "installtype",
                 "cleardiskssel",
                 "parttype",
                 "autopartitionexecute",
@@ -143,11 +142,6 @@ class BaseInstallClass(object):
        if flags.cmdline.has_key("upgrade"):
            dispatch.skipStep("findrootparts", skip = 0)

-        # if there's only one install class, it doesn't make much sense
-        # to show it
-        if len(availableClasses()) < 2:
-            dispatch.skipStep("installtype", permanent=1)
-
        # allow interface backends to skip certain steps.
        anaconda.intf.setSteps(anaconda)

diff --git a/iw/examine_gui.py b/iw/examine_gui.py
index e40ebf8..56c9605 100644
--- a/iw/examine_gui.py
+++ b/iw/examine_gui.py
@@ -47,10 +47,8 @@ class UpgradeExamineWindow (InstallWindow):
            self.anaconda.upgradeRoot = [(rootfs[0], rootfs[1])]
            self.anaconda.rootParts = self.parts

-            self.anaconda.dispatch.skipStep("installtype", skip = 1)
            self.anaconda.upgrade = True
        else:
-            self.anaconda.dispatch.skipStep("installtype", skip = 0)
            self.anaconda.upgrade = False

        return None
@@ -89,7 +87,7 @@ class UpgradeExamineWindow (InstallWindow):

        if not seenExamineScreen:
	    # this is the first time we've entered this screen
-	    self.doupgrade = self.anaconda.dispatch.stepInSkipList("installtype")
+	    self.doupgrade = False
            seenExamineScreen = True
	else:
	    self.doupgrade = self.anaconda.upgrade
diff --git a/kickstart.py b/kickstart.py
index 8e3368d..d7c81b1 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -1416,18 +1416,15 @@ def setSteps(anaconda):
        dispatch.skipStep("language")
        dispatch.skipStep("keyboard")
        dispatch.skipStep("betanag")
-        dispatch.skipStep("installtype")
    else:
        anaconda.instClass.setSteps(anaconda)
        dispatch.skipStep("findrootparts")

    if interactive or flags.autostep:
-        dispatch.skipStep("installtype")
        dispatch.skipStep("bootdisk")

    dispatch.skipStep("bootdisk")
    dispatch.skipStep("betanag")
-    dispatch.skipStep("installtype")
    dispatch.skipStep("network")

    # Storage is initialized for us right when kickstart processing starts.
diff --git a/textw/upgrade_text.py b/textw/upgrade_text.py
index 7fd7ebe..fdb5eee 100644
--- a/textw/upgrade_text.py
+++ b/textw/upgrade_text.py
@@ -215,7 +215,7 @@ class UpgradeExamineWindow:

        global seenExamineScreen

-	if (not seenExamineScreen and anaconda.dispatch.stepInSkipList("installtype")) or anaconda.upgrade:
+	if anaconda.upgrade:
            default = 1
        else:
            default = 0
@@ -249,9 +249,7 @@ class UpgradeExamineWindow:

            anaconda.upgradeRoot = [(root[0], root[1])]
            anaconda.rootParts = parts
-            anaconda.dispatch.skipStep("installtype", skip = 1)
        else:
-            anaconda.dispatch.skipStep("installtype", skip = 0)
            anaconda.upgradeRoot = None

        seenExamineScreen = True
diff --git a/upgrade.py b/upgrade.py
index 91e8911..dd634c4 100644
--- a/upgrade.py
+++ b/upgrade.py
@@ -84,11 +84,8 @@ def findRootParts(anaconda):

    if anaconda.rootParts is not None and len(anaconda.rootParts) > 0:
        anaconda.dispatch.skipStep("findinstall", skip = 0)
-        if productName.find("Red Hat Enterprise Linux") == -1:
-            anaconda.dispatch.skipStep("installtype", skip = 1)
    else:
        anaconda.dispatch.skipStep("findinstall", skip = 1)
-        anaconda.dispatch.skipStep("installtype", skip = 0)

def findExistingRoots(anaconda, upgradeany=False):
    rootparts = findExistingRootDevices(anaconda, upgradeany=upgradeany)
@@ -308,7 +305,6 @@ def setSteps(anaconda):
                "filtertype",
                "filter",
                "cleardiskssel",
-                "installtype",
                "storageinit",
                "findrootparts",
                "findinstall",


- -- David Cantrell <dcantrell redhat com>
Red Hat / Honolulu, HI

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)

iEYEARECAAYFAkvqxZIACgkQ5hsjjIy1Vkk8KgCcCZ6QNUziGOtw0shP2XKXfN2J
U9wAniJcMry+qo/lHxUztGznVFkfhOFy
=SZMc
-----END PGP SIGNATURE-----


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