diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-05-20 15:26:00 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-05-20 15:26:00 +0000 |
| commit | 1f3bf130e3705ed4d77af08cf51c12128ab5424d (patch) | |
| tree | 9f5d2f3b64e7aa17b261e911cb1fff0547451e7d /installclasses | |
| parent | 445f36acfd30cd71b89e8ed7385b74cb9da0f2dc (diff) | |
| download | anaconda-1f3bf130e3705ed4d77af08cf51c12128ab5424d.tar.gz anaconda-1f3bf130e3705ed4d77af08cf51c12128ab5424d.tar.xz anaconda-1f3bf130e3705ed4d77af08cf51c12128ab5424d.zip | |
merge from taroon branch to HEAD. mostly the package stuff, but also
msw's ctrl-alt-del thing and some arch fixups
Diffstat (limited to 'installclasses')
| -rw-r--r-- | installclasses/personal_desktop.py | 11 | ||||
| -rw-r--r-- | installclasses/server.py | 9 | ||||
| -rw-r--r-- | installclasses/workstation.py | 12 |
3 files changed, 15 insertions, 17 deletions
diff --git a/installclasses/personal_desktop.py b/installclasses/personal_desktop.py index b09cea076..564e4564a 100644 --- a/installclasses/personal_desktop.py +++ b/installclasses/personal_desktop.py @@ -27,14 +27,13 @@ class InstallClass(BaseInstallClass): dispatch.skipStep("desktopchoice", skip = 0) dispatch.skipStep("package-selection", skip = 1) - def setGroupSelection(self, comps, intf): - BaseInstallClass.__init__(self, comps) + def setGroupSelection(self, grpset, intf): + BaseInstallClass.__init__(self, grpset) - for comp in comps.comps: - comp.unselect() + grpset.unselectAll() - comps["Workstation Common"].includeMembers() - comps["GNOME Desktop Environment"].select() + grpset.selectGroup("workstation-common", asMeta = 1) + grpset.selectGroup("gnome-desktop") def setInstallData(self, id): BaseInstallClass.setInstallData(self, id) diff --git a/installclasses/server.py b/installclasses/server.py index 337a4cd91..df03d304f 100644 --- a/installclasses/server.py +++ b/installclasses/server.py @@ -24,12 +24,11 @@ class InstallClass(BaseInstallClass): BaseInstallClass.setSteps(self, dispatch); dispatch.skipStep("authentication") - def setGroupSelection(self, comps, intf): - BaseInstallClass.__init__(self, comps) + def setGroupSelection(self, grpset, intf): + BaseInstallClass.__init__(self, grpset) - for comp in comps.comps: - comp.unselect() - comps["Server"].includeMembers() + grpset.unselectAll() + grpset.selectGroup("server", asMeta = 1) def setInstallData(self, id): BaseInstallClass.setInstallData(self, id) diff --git a/installclasses/workstation.py b/installclasses/workstation.py index 0733f03f0..89560e751 100644 --- a/installclasses/workstation.py +++ b/installclasses/workstation.py @@ -14,12 +14,12 @@ class InstallClass(personal_desktop.InstallClass): sortPriority = 2 showLoginChoice = 0 - def setGroupSelection(self, comps, intf): - personal_desktop.InstallClass.setGroupSelection(self, comps, intf) - comps["Emacs"].select() - comps["GNOME Software Development"].select() - comps["X Software Development"].select() - comps["Development Tools"].select() + 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") def __init__(self, expert): personal_desktop.InstallClass.__init__(self, expert) |