Move instClass to be an attribute on Anaconda.

12 files changed, 31 insertions, 34 deletions

diff --git a/anaconda b/anaconda
index 3774dd900..f01875ebe 100755
--- a/anaconda
+++ b/anaconda
@@ -449,6 +449,7 @@ class Anaconda:
         self.displayMode = None
         self.id = None
         self.intf = None
+        self.instClass = None
         self.isHeadless = False
         self.ksdata = None
         self.mediaDevice = None
@@ -525,8 +526,8 @@ class Anaconda:
 
         self.intf = InstallInterface()
 
-    def setBackend(self, instClass):
-        b = instClass.getBackend()
+    def setBackend(self):
+        b = self.instClass.getBackend()
         self.backend = apply(b, (self,))
 
     def setMethodstr(self, methodstr):
@@ -644,7 +645,6 @@ if __name__ == "__main__":
 
     extraModules = []               # XXX: this would be better as a callback
     graphical_failed = 0
-    instClass = None                # the install class to use
     vncS = vnc.VncServer()          # The vnc Server object.
     vncS.anaconda = anaconda
     xserver_pid = None
@@ -656,7 +656,7 @@ if __name__ == "__main__":
         sys.exit(0)
 
     # Now that we've got arguments, do some extra processing.
-    instClass = getInstClass()
+    anaconda.instClass = getInstClass()
 
     setupLoggingFromOpts(opts)
 
@@ -784,7 +784,7 @@ if __name__ == "__main__":
         anaconda.id = instdata.InstallData(anaconda, [])
 
         if anaconda.ksdata:
-            instClass.setInstallData(anaconda)
+            anaconda.instClass.setInstallData(anaconda)
 
             # We need an interface before running kickstart execute methods for
             # storage.
@@ -800,7 +800,7 @@ if __name__ == "__main__":
             # command line 'nomount' overrides kickstart /same for vnc/
             anaconda.rescue_mount = not (opts.rescue_nomount or anaconda.ksdata.rescue.nomount)
 
-        rescue.runRescue(anaconda, instClass)
+        rescue.runRescue(anaconda)
 
         # shouldn't get back here
         sys.exit(1)
@@ -936,14 +936,13 @@ if __name__ == "__main__":
 
     anaconda.setInstallInterface()
 
-    anaconda.setBackend(instClass)
+    anaconda.setBackend()
 
-    anaconda.id = instClass.installDataClass(anaconda, extraModules)
+    anaconda.id = anaconda.instClass.installDataClass(anaconda, extraModules)
+    anaconda.instClass.setInstallData(anaconda)
 
     anaconda.id.x_already_set = x_already_set
 
-    instClass.setInstallData(anaconda)
-
     # comment out the next line to make exceptions non-fatal
     from exception import initExceptionHandling
     anaconda.mehConfig = initExceptionHandling(anaconda)
@@ -1023,7 +1022,7 @@ if __name__ == "__main__":
         anaconda.dispatch.skipStep("keyboard", permanent = 1)
 
     if not anaconda.ksdata:
-        instClass.setSteps(anaconda)
+        anaconda.instClass.setSteps(anaconda)
     else:
         kickstart.setSteps(anaconda)
 
diff --git a/backend.py b/backend.py
index 0342c6aa0..139fecaa0 100644
--- a/backend.py
+++ b/backend.py
@@ -306,9 +306,9 @@ def doBasePackageSelect(anaconda):
     anaconda.backend.resetPackageSelections()
     if anaconda.ksdata:
         kickstart.selectPackages(anaconda)
-    elif anaconda.id.displayMode != 't':
-        anaconda.id.instClass.setPackageSelection(anaconda)
-        anaconda.id.instClass.setGroupSelection(anaconda)
+    elif anaconda.displayMode != 't':
+        anaconda.instClass.setPackageSelection(anaconda)
+        anaconda.instClass.setGroupSelection(anaconda)
 
 def writeConfiguration(anaconda):
     log.info("Writing main configuration")
diff --git a/exception.py b/exception.py
index 361d78a85..848c27af3 100644
--- a/exception.py
+++ b/exception.py
@@ -92,7 +92,7 @@ class AnacondaExceptionHandler(ExceptionHandler):
 def initExceptionHandling(anaconda):
     conf = Config(programName="anaconda",
                   programVersion=isys.getAnacondaVersion(),
-                  bugFiler=anaconda.id.instClass.bugFiler,
+                  bugFiler=anaconda.instClass.bugFiler,
                   attrSkipList=[ "backend.ayum",
                                  "backend.dlpkgs",
                                  "id.accounts",
diff --git a/gui.py b/gui.py
index 4de661a9f..2ba0905c5 100755
--- a/gui.py
+++ b/gui.py
@@ -548,15 +548,15 @@ class ProgressWindow:
 class InstallKeyWindow:
     def __init__(self, anaconda, key):
         (keyxml, self.win) = getGladeWidget("instkey.glade", "instkeyDialog")
-        if anaconda.id.instClass.instkeydesc is not None:
+        if anaconda.instClass.instkeydesc is not None:
             w = keyxml.get_widget("instkeyLabel")
-            w.set_text(_(anaconda.id.instClass.instkeydesc))
+            w.set_text(_(anaconda.instClass.instkeydesc))
 
-        if not anaconda.id.instClass.allowinstkeyskip:
+        if not anaconda.instClass.allowinstkeyskip:
             keyxml.get_widget("skipRadio").hide()
 
-        keyName = _(anaconda.id.instClass.instkeyname)
-        if anaconda.id.instClass.instkeyname is None:
+        keyName = _(anaconda.instClass.instkeyname)
+        if anaconda.instClass.instkeyname is None:
             keyName = _("Installation Key")
 
         # set the install key name based on the installclass
@@ -573,7 +573,7 @@ class InstallKeyWindow:
         self.skipradio = keyxml.get_widget("skipRadio")
         self.rc = 0
 
-        if anaconda.id.instClass.skipkey:
+        if anaconda.instClass.skipkey:
             self.skipradio.set_active(True)
         else:
             self.entry.grab_focus()
diff --git a/installclass.py b/installclass.py
index e07f9758d..492fa7738 100644
--- a/installclass.py
+++ b/installclass.py
@@ -200,7 +200,6 @@ class BaseInstallClass(object):
 
     def setInstallData(self, anaconda):
         anaconda.id.reset()
-        anaconda.id.instClass = self
         anaconda.id.bootloader.timeout = self.bootloaderTimeoutDefault
 
     def versionMatches(self, oldver):
diff --git a/instdata.py b/instdata.py
index fa124c43d..972990421 100644
--- a/instdata.py
+++ b/instdata.py
@@ -60,7 +60,6 @@ class InstallData:
         # - The install language
         # - The keyboard
 
-        self.instClass = None
         self.network = network.Network()
         self.firewall = firewall.Firewall()
         self.security = security.Security()
diff --git a/iw/task_gui.py b/iw/task_gui.py
index cb7ab0628..a02adcb8c 100644
--- a/iw/task_gui.py
+++ b/iw/task_gui.py
@@ -660,14 +660,14 @@ class TaskWindow(InstallWindow):
         self.backend = anaconda.backend
         self.anaconda = anaconda
 
-        self.tasks = anaconda.id.instClass.tasks
+        self.tasks = anaconda.instClass.tasks
         self.repos = anaconda.backend.ayum.repos
 
         (self.xml, vbox) = gui.getGladeWidget("tasksel.glade", "taskBox")
 
         lbl = self.xml.get_widget("mainLabel")
-        if anaconda.id.instClass.description:
-            lbl.set_text(_(anaconda.id.instClass.description))
+        if anaconda.instClass.description:
+            lbl.set_text(_(anaconda.instClass.description))
         else:
             txt = lbl.get_text()
             lbl.set_text(txt %(productName,))
diff --git a/kickstart.py b/kickstart.py
index f806bd05a..f16773e1c 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -187,7 +187,7 @@ class AutoPart(commands.autopart.F12_AutoPart):
     def execute(self, anaconda):
         # sets up default autopartitioning.  use clearpart separately
         # if you want it
-        anaconda.id.instClass.setDefaultPartitioning(anaconda.id.storage, anaconda.platform)
+        anaconda.instClass.setDefaultPartitioning(anaconda.id.storage, anaconda.platform)
         anaconda.id.storage.doAutoPart = True
 
         if self.encrypted:
@@ -1283,7 +1283,7 @@ def selectPackages(anaconda):
     # selections.  This can also be explicitly specified with %packages
     # --default.  Otherwise, select whatever was given (even if it's nothing).
     if not ksdata.packages.seen or ksdata.packages.default:
-        anaconda.id.instClass.setGroupSelection(anaconda)
+        anaconda.instClass.setGroupSelection(anaconda)
         return
 
     for pkg in ksdata.packages.packageList:
@@ -1372,7 +1372,7 @@ def setSteps(anaconda):
         dispatch.skipStep("betanag")
         dispatch.skipStep("installtype")
     else:
-        anaconda.id.instClass.setSteps(anaconda)
+        anaconda.instClass.setSteps(anaconda)
         dispatch.skipStep("findrootparts")
 
     if interactive or flags.autostep:
diff --git a/packages.py b/packages.py
index 7e79b832f..7afdcc42b 100644
--- a/packages.py
+++ b/packages.py
@@ -46,7 +46,7 @@ import gettext
 _ = lambda x: gettext.ldgettext("anaconda", x)
 
 def doPostAction(anaconda):
-    anaconda.id.instClass.postAction(anaconda)
+    anaconda.instClass.postAction(anaconda)
 
 def firstbootConfiguration(anaconda):
     if anaconda.id.firstboot == FIRSTBOOT_RECONFIG:
diff --git a/rescue.py b/rescue.py
index ca8be3655..4bd822b36 100644
--- a/rescue.py
+++ b/rescue.py
@@ -216,7 +216,7 @@ def runShell(screen = None, msg=""):
     if screen:
         screen.finish()
 
-def runRescue(anaconda, instClass):
+def runRescue(anaconda):
     for file in [ "services", "protocols", "group", "joe", "man.config",
                   "nsswitch.conf", "selinux", "mke2fs.conf" ]:
         try:
diff --git a/storage/__init__.py b/storage/__init__.py
index c86345567..0bea0250b 100644
--- a/storage/__init__.py
+++ b/storage/__init__.py
@@ -1275,7 +1275,7 @@ def findExistingRootDevices(anaconda, upgradeany=False):
         if os.access(anaconda.rootPath + "/etc/fstab", os.R_OK):
             (product, version) = getReleaseString(anaconda.rootPath)
             if upgradeany or \
-               anaconda.id.instClass.productUpgradable(product, version):
+               anaconda.instClass.productUpgradable(product, version):
                 rootDevs.append((device, "%s %s" % (product, version)))
             else:
                 log.info("product %s version %s found on %s is not upgradable"
diff --git a/yuminstall.py b/yuminstall.py
index 242ea9801..294be46a8 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -504,8 +504,8 @@ class AnacondaYum(YumSorter):
         # add default repos
         anacondabaseurl = (self.anaconda.methodstr or
                            "cdrom:%s" % (self.anaconda.mediaDevice))
-        anacondabasepaths = self.anaconda.id.instClass.getPackagePaths(anacondabaseurl)
-        for (name, uri) in self.anaconda.id.instClass.getPackagePaths(self._baseRepoURL).items():
+        anacondabasepaths = self.anaconda.instClass.getPackagePaths(anacondabaseurl)
+        for (name, uri) in self.anaconda.instClass.getPackagePaths(self._baseRepoURL).items():
             rid = name.replace(" ", "")
 
             repo = AnacondaYumRepo("anaconda-%s-%s" % (rid, productStamp))