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

Re: Exlude full and minimal install option



On Mon, Jul 26, 2004 at 08:38:48AM +0400, Timofey Korolyov wrote:
> Can anybody tell me how can i remove full install and minimal install
> options which are shown on package selection screen?

The attached two patches (sorry, I should merge them, but I haven't gotten a
chance) remove the Everything (full install) option. You can probably figure
out minimal from there.



-- 
Matthew Miller           mattdm mattdm org        <http://www.mattdm.org/>
Boston University Linux      ------>                <http://linux.bu.edu/>
diff -ur anaconda-9.0.orig/comps.py anaconda-9.0/comps.py
--- anaconda-9.0.orig/comps.py	2003-02-11 23:40:03.000000000 -0500
+++ anaconda-9.0/comps.py	2003-03-25 16:24:12.000000000 -0500
@@ -747,17 +747,6 @@
         groups = self.compsxml.groups.keys()
         groups.sort()
 
-        # be leet and construct an everything group
-        everything = rhpl.comps.Group(self.compsxml)
-        everything.name = N_("Everything")
-        everything.id = "everything"
-        for pkg in packages.keys():
-            if ExcludePackages.has_key(packages[pkg]['name']):
-                continue
-            everything.packages[pkg] = (u'mandatory', pkg)
-        self.compsxml.groups['Everything'] = everything
-        groups.append('Everything')
-
         if os.environ.has_key("LANG"):
             langs = language.expandLangs(os.environ["LANG"])
         else:
@@ -765,27 +754,14 @@
 
         # we have to go through first and make Comp objects for all
         # of the groups.  then we can go through and set up the includes
-        for group in groups[:-1]:
+        for group in groups:
             group = self.compsxml.groups[group]
             comp = Component(self, group, packages, langs = langs)
             self.comps.append(comp)
             self.compsDict[comp.name] = comp
             self.compsById[comp.id] = comp
 
-        # special case everything to make it faster...
-        for group in [ groups[-1] ]:
-            group = self.compsxml.groups[group]
-            comp = Component(self, group, packages, doDeps = 0, langs = langs)
-            # everything really is a hack
-            comp.displayName = _("Everything")
-            self.comps.append(comp)
-            self.compsDict[comp.name] = comp
-            self.compsById[comp.id] = comp
-
         for group in groups:
-            # everything is special and this speeds things up a bit
-            if group == "everything":
-                continue
             group = self.compsxml.groups[group]            
             comp = self.compsDict[group.name]
             for id in group.groups.keys():
@@ -804,24 +780,6 @@
                 else:
                     comp.addMetaPkg(self.compsById[id], isDefault = 0)
 
-##         everything = Component(self, N_("Everything"), 0, 0)
-##         for package in packages.keys ():
-## 	    if ExcludePackages.has_key(packages[package][rpm.RPMTAG_NAME]):
-##                 continue
-##             if self.expressions.has_key (packages[package]): 
-##                 expressions = self.expressions[packages[package]]
-##                 if expressions == None:
-##                     everything.addPackageWithExpression (None,
-##                                                          packages[package])
-##                 else:
-##                     for expression in expressions:
-##                         everything.addPackageWithExpression (expression,
-##                                                              packages[package])
-##             else:
-##                 everything.addPackage (packages[package])
-##         self.comps.append (everything)
-##         self.compsDict["Everything"] = everything
-
 	for comp in self.comps:
 	    comp.setDefaultSelection()
 
@@ -1093,11 +1051,7 @@
     return (retlist, retdict)
 
 def getCompGroupDescription(comp):
-    if comp.name == u"Everything":
-	return _("This group includes all the packages available.  Note that "
-		 "there are substantially more packages than just the ones "
-		 "in all the other package groups on this page.")
-    elif comp.name == u"Base":
+    if comp.name == u"Base":
 	return _("Choose this group to get the minimal possible set of "
 		 "packages.  Useful for creating small router/firewall "
 		 "boxes, for example.")
--- anaconda-10.0.orig/hdrlist.py	2004-05-11 13:38:14.000000000 -0400
+++ anaconda-10.0/hdrlist.py	2004-05-14 14:36:59.608354530 -0400
@@ -755,34 +755,6 @@
             group = Group(self, xmlgrp)
             self.groups[xmlgrp.id] = group
 
-        # build up an Everything group 
-        everything = rhpl.comps.Group(self.compsxml)
-        everything.name = N_("Everything")
-        everything.id = "everything"
-        everything.description = EVERYTHING_DESCRIPTION
-
-        multiarch = rhpl.arch.getMultiArchInfo()
-        if multiarch is not None:
-            (comp, best, biarch) = multiarch
-        for pkgname in hdrlist.pkgnames.keys():
-            if EverythingExclude.has_key(pkgname):
-                continue
-            
-            mainnevra = hdrlist.getBestNevra(pkgname, prefArch = None)
-            if mainnevra is None:
-                continue
-            
-            everything.packages[mainnevra] = (u"mandatory", mainnevra)
-            if multiarch is not None:
-                # get the main and the biarch version of this package
-                # for everything group
-                secnevra = hdrlist.getBestNevra(pkgname, prefArch = biarch)
-                if mainnevra != secnevra and secnevra is not None:
-                    everything.packages[secnevra] = (u"mandatory", secnevra)
-
-        self.compsxml.groups["Everything"] = everything
-        self.groups["everything"] = Group(self, everything)
-
         # have to do includes and metagroups in a second pass so that
         # we can make sure the group is defined.  
         for xmlgrp in compsxml.groups.values():

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