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 /kickstart.py | |
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 'kickstart.py')
-rw-r--r-- | kickstart.py | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/kickstart.py b/kickstart.py index 4391c6402..4e2b11fc3 100644 --- a/kickstart.py +++ b/kickstart.py @@ -1192,9 +1192,6 @@ class KickstartBase(BaseInstallClass): # Note that this assumes setGroupSelection() is called after # setPackageSelection() def setPackageSelection(self, hdlist, intf): - for pkg in hdlist.keys(): - hdlist[pkg].setState((0, 0)) - for n in self.packageList: if hdlist.has_key(n): hdlist[n].select() @@ -1216,35 +1213,35 @@ class KickstartBase(BaseInstallClass): pass - def setGroupSelection(self, comps, intf): - for comp in comps: - comp.unselect() + def setGroupSelection(self, grpset, intf): + grpset.unselectAll() - comps['Base'].select() + grpset.selectGroup("base") for n in self.groupList: - if comps.has_key(n): - comps[n].select() - elif self.handleMissing == KS_MISSING_IGNORE: - log("group %s doesn't exist, ignoring" %(n,)) - else: - rc = intf.messageWindow(_("Missing Group"), - _("You have specified that the " - "group '%s' should be installed. " - "This group does not exist. " - "Would you like to continue or " - "abort your installation?") %(n,), - type="custom", - custom_buttons=[_("_Abort"), - _("_Continue")]) - if rc == 0: - sys.exit(1) + try: + grpset.selectGroup(n) + except KeyError: + if self.handleMissing == KS_MISSING_IGNORE: + log("group %s doesn't exist, ignoring" %(n,)) else: - pass + rc = intf.messageWindow(_("Missing Group"), + _("You have specified that the " + "group '%s' should be installed. " + "This group does not exist. " + "Would you like to continue or " + "abort your installation?") + %(n,), + type="custom", + custom_buttons=[_("_Abort"), + _("_Continue")]) + if rc == 0: + sys.exit(1) + else: + pass - for n in self.excludedList: - if comps.packages.has_key(n): - comps.packages[n].unselect() + if grpset.hdrlist.has_key(n): + grpset.hdrlist[n].unselect(isManual = 1) else: log("%s does not exist, can't exclude" %(n,)) |