Finish making non-UI steps pass around the anaconda object.

9 files changed, 74 insertions, 74 deletions

diff --git a/installclasses/custom.py b/installclasses/custom.py
index 7b49cdef2..a177f4710 100644
--- a/installclasses/custom.py
+++ b/installclasses/custom.py
@@ -18,9 +18,9 @@ class InstallClass(BaseInstallClass):
     showMinimal = 1
     hidden = 1
 
-    def setInstallData(self, id):
-	BaseInstallClass.setInstallData(self, id)
-        BaseInstallClass.setDefaultPartitioning(self, id.partitions,
+    def setInstallData(self, anaconda):
+	BaseInstallClass.setInstallData(self, anaconda)
+        BaseInstallClass.setDefaultPartitioning(self, anaconda.id.partitions,
                                                 CLEARPART_TYPE_LINUX)
 
     def __init__(self, expert):
diff --git a/installclasses/fedora.py b/installclasses/fedora.py
index 0c7c7fea1..afd9d21c1 100644
--- a/installclasses/fedora.py
+++ b/installclasses/fedora.py
@@ -21,14 +21,14 @@ class InstallClass(BaseInstallClass):
              (N_("Software Development"), ["development-libs", "development-tools", "gnome-software-development", "x-software-development"],),
              (N_("Web server"), ["web-server"])]
 
-    def setInstallData(self, id, intf = None):
-	BaseInstallClass.setInstallData(self, id)
-        BaseInstallClass.setDefaultPartitioning(self, id.partitions,
+    def setInstallData(self, anaconda):
+	BaseInstallClass.setInstallData(self, anaconda)
+        BaseInstallClass.setDefaultPartitioning(self, anaconda.id.partitions,
                                                 CLEARPART_TYPE_LINUX)
 
-    def setGroupSelection(self, backend, intf):
-        grps = backend.getDefaultGroups()
-        map(lambda x: backend.selectGroup(x), grps)
+    def setGroupSelection(self, anaconda):
+        grps = anaconda.backend.getDefaultGroups()
+        map(lambda x: anaconda.backend.selectGroup(x), grps)
 
     def setSteps(self, dispatch):
 	BaseInstallClass.setSteps(self, dispatch);
diff --git a/installclasses/personal_desktop.py b/installclasses/personal_desktop.py
index b5be75563..9ec88257b 100644
--- a/installclasses/personal_desktop.py
+++ b/installclasses/personal_desktop.py
@@ -34,18 +34,18 @@ class InstallClass(BaseInstallClass):
         dispatch.skipStep("desktopchoice", skip = 0)
         dispatch.skipStep("package-selection", skip = 1)
 
-    def setGroupSelection(self, grpset, intf):
-	BaseInstallClass.__init__(self, grpset)
+    def setGroupSelection(self, anaconda):
+	BaseInstallClass.__init__(self, anaconda.backend)
 
-        grpset.unselectAll()
+        anaconda.backend.unselectAll()
 
-        grpset.selectGroup("workstation-common", asMeta = 1)
-        grpset.selectGroup("gnome-desktop")
-        grpset.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
+        anaconda.backend.selectGroup("workstation-common", asMeta = 1)
+        anaconda.backend.selectGroup("gnome-desktop")
+        anaconda.backend.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
 
-    def setInstallData(self, id):
-	BaseInstallClass.setInstallData(self, id)
-        BaseInstallClass.setDefaultPartitioning(self, id.partitions,
+    def setInstallData(self, anaconda):
+	BaseInstallClass.setInstallData(self, anaconda)
+        BaseInstallClass.setDefaultPartitioning(self, anaconda.id.partitions,
                                                 CLEARPART_TYPE_LINUX)
 
     def __init__(self, expert):
diff --git a/installclasses/rhel_as.py b/installclasses/rhel_as.py
index 7ecf3446e..39b36e47b 100644
--- a/installclasses/rhel_as.py
+++ b/installclasses/rhel_as.py
@@ -24,18 +24,18 @@ class InstallClass(BaseInstallClass):
         dispatch.skipStep("desktopchoice", skip = 0)
         dispatch.skipStep("package-selection", skip = 1)
 
-    def setGroupSelection(self, grpset, intf):
-	BaseInstallClass.__init__(self, grpset)
+    def setGroupSelection(self, anaconda):
+	BaseInstallClass.__init__(self, anaconda.backend)
 
-        grpset.unselectAll()
-        grpset.selectGroup("server", asMeta = 1)
-        grpset.selectGroup("base-x")
-        grpset.selectGroup("gnome-desktop")
-        grpset.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
+        anaconda.backend.unselectAll()
+        anaconda.backend.selectGroup("server", asMeta = 1)
+        anaconda.backend.selectGroup("base-x")
+        anaconda.backend.selectGroup("gnome-desktop")
+        anaconda.backend.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
         
-    def setInstallData(self, id):
-	BaseInstallClass.setInstallData(self, id)
-        BaseInstallClass.setDefaultPartitioning(self, id.partitions,
+    def setInstallData(self, anaconda):
+	BaseInstallClass.setInstallData(self, anaconda)
+        BaseInstallClass.setDefaultPartitioning(self, anaconda.id.partitions,
                                                 CLEARPART_TYPE_ALL)
 
     def __init__(self, expert):
diff --git a/installclasses/rhel_desktop.py b/installclasses/rhel_desktop.py
index 0a110dbba..09dcabd02 100644
--- a/installclasses/rhel_desktop.py
+++ b/installclasses/rhel_desktop.py
@@ -26,17 +26,17 @@ class InstallClass(BaseInstallClass):
         dispatch.skipStep("desktopchoice", skip = 0)
         dispatch.skipStep("package-selection", skip = 1)
 
-    def setGroupSelection(self, grpset, intf):
-	BaseInstallClass.__init__(self, grpset)
+    def setGroupSelection(self, anaconda):
+	BaseInstallClass.__init__(self, anaconda)
 
-        grpset.unselectAll()
-        grpset.selectGroup("workstation-common", asMeta = 1)
-        grpset.selectGroup("gnome-desktop")        
-        grpset.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
+        anaconda.unselectAll()
+        anaconda.selectGroup("workstation-common", asMeta = 1)
+        anaconda.selectGroup("gnome-desktop")        
+        anaconda.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
         
-    def setInstallData(self, id):
-	BaseInstallClass.setInstallData(self, id)
-        BaseInstallClass.setDefaultPartitioning(self, id.partitions,
+    def setInstallData(self, anaconda):
+	BaseInstallClass.setInstallData(self, anaconda)
+        BaseInstallClass.setDefaultPartitioning(self, anaconda.id.partitions,
                                                 CLEARPART_TYPE_LINUX)
 
     def __init__(self, expert):
diff --git a/installclasses/rhel_es.py b/installclasses/rhel_es.py
index d5ae444e2..07ffe1d7d 100644
--- a/installclasses/rhel_es.py
+++ b/installclasses/rhel_es.py
@@ -24,18 +24,18 @@ class InstallClass(BaseInstallClass):
         dispatch.skipStep("desktopchoice", skip = 0)
         dispatch.skipStep("package-selection", skip = 1)
     
-    def setGroupSelection(self, grpset, intf):
-	BaseInstallClass.__init__(self, grpset)
+    def setGroupSelection(self, anaconda):
+	BaseInstallClass.__init__(self, anaconda.backend)
 
-        grpset.unselectAll()
-        grpset.selectGroup("server", asMeta = 1)
-        grpset.selectGroup("base-x")        
-        grpset.selectGroup("gnome-desktop")
-        grpset.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
+        anaconda.backend.unselectAll()
+        anaconda.backend.selectGroup("server", asMeta = 1)
+        anaconda.backend.selectGroup("base-x")        
+        anaconda.backend.selectGroup("gnome-desktop")
+        anaconda.backend.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
         
-    def setInstallData(self, id):
-	BaseInstallClass.setInstallData(self, id)
-        BaseInstallClass.setDefaultPartitioning(self, id.partitions,
+    def setInstallData(self, anaconda):
+	BaseInstallClass.setInstallData(self, anaconda)
+        BaseInstallClass.setDefaultPartitioning(self, anaconda.id.partitions,
                                                 CLEARPART_TYPE_ALL)
 
     def __init__(self, expert):
diff --git a/installclasses/rhel_ws.py b/installclasses/rhel_ws.py
index c981181d5..a160714ed 100644
--- a/installclasses/rhel_ws.py
+++ b/installclasses/rhel_ws.py
@@ -28,19 +28,19 @@ class InstallClass(BaseInstallClass):
         dispatch.skipStep("desktopchoice", skip = 0)
         dispatch.skipStep("package-selection", skip = 1)
 
-    def setGroupSelection(self, grpset, intf):
-	BaseInstallClass.__init__(self, grpset)
+    def setGroupSelection(self, anaconda):
+	BaseInstallClass.__init__(self, anaconda.backend)
 
-        grpset.unselectAll()
-        grpset.selectGroup("workstation-common", asMeta = 1)
-        grpset.selectGroup("gnome-desktop")        
-        grpset.selectGroup("development-tools")
-        grpset.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
-        grpset.selectGroup("compat-arch-development", asMeta = 1, missingOk = 1)
+        anaconda.backend.unselectAll()
+        anaconda.backend.selectGroup("workstation-common", asMeta = 1)
+        anaconda.backend.selectGroup("gnome-desktop")        
+        anaconda.backend.selectGroup("development-tools")
+        anaconda.backend.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
+        anaconda.backend.selectGroup("compat-arch-development", asMeta = 1, missingOk = 1)
         
-    def setInstallData(self, id):
-	BaseInstallClass.setInstallData(self, id)
-        BaseInstallClass.setDefaultPartitioning(self, id.partitions,
+    def setInstallData(self, anaconda):
+	BaseInstallClass.setInstallData(self, anaconda)
+        BaseInstallClass.setDefaultPartitioning(self, anaconda.id.partitions,
                                                 CLEARPART_TYPE_LINUX)
 
     def __init__(self, expert):
diff --git a/installclasses/server.py b/installclasses/server.py
index 1ca9b73db..819357a59 100644
--- a/installclasses/server.py
+++ b/installclasses/server.py
@@ -23,16 +23,16 @@ class InstallClass(BaseInstallClass):
     def setSteps(self, dispatch):
 	BaseInstallClass.setSteps(self, dispatch);
 
-    def setGroupSelection(self, grpset, intf):
-	BaseInstallClass.__init__(self, grpset)
+    def setGroupSelection(self, anaconda):
+	BaseInstallClass.__init__(self, anaconda.backend)
 
-        grpset.unselectAll()
-        grpset.selectGroup("server", asMeta = 1)
-        grpset.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
+        anaconda.backend.unselectAll()
+        anaconda.backend.selectGroup("server", asMeta = 1)
+        anaconda.backend.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
 
-    def setInstallData(self, id):
-	BaseInstallClass.setInstallData(self, id)
-        BaseInstallClass.setDefaultPartitioning(self, id.partitions,
+    def setInstallData(self, anaconda):
+	BaseInstallClass.setInstallData(self, anaconda)
+        BaseInstallClass.setDefaultPartitioning(self, anaconda.id.partitions,
                                                 CLEARPART_TYPE_ALL)
 
     def __init__(self, expert):
diff --git a/installclasses/workstation.py b/installclasses/workstation.py
index dcc848b12..6fa8ef6a8 100644
--- a/installclasses/workstation.py
+++ b/installclasses/workstation.py
@@ -26,14 +26,14 @@ class InstallClass(personal_desktop.InstallClass):
     showLoginChoice = 0
     hidden = 1
 
-    def setGroupSelection(self, grpset, intf):
-        personal_desktop.InstallClass.setGroupSelection(self, grpset, intf)
-        grpset.selectGroup("emacs")
-        grpset.selectGroup("gnome-software-development")
-	grpset.selectGroup("x-software-development")
-        grpset.selectGroup("development-tools")
-        grpset.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
-        grpset.selectGroup("compat-arch-development", asMeta = 1, missingOk = 1)
+    def setGroupSelection(self, anaconda):
+        personal_desktop.InstallClass.setGroupSelection(self, anaconda.backend, intf)
+        anaconda.backend.selectGroup("emacs")
+        anaconda.backend.selectGroup("gnome-software-development")
+	anaconda.backend.selectGroup("x-software-development")
+        anaconda.backend.selectGroup("development-tools")
+        anaconda.backend.selectGroup("compat-arch-support", asMeta = 1, missingOk = 1)
+        anaconda.backend.selectGroup("compat-arch-development", asMeta = 1, missingOk = 1)
         
     def __init__(self, expert):
 	personal_desktop.InstallClass.__init__(self, expert)