Remove unused functions from packages.py.

1 files changed, 0 insertions, 166 deletions

diff --git a/packages.py b/packages.py
index 436afa6c1..7862840ee 100644
--- a/packages.py
+++ b/packages.py
@@ -131,88 +131,6 @@ def writeXConfiguration(id, instPath):
     id.xsetup.write(fn+"/etc/X11", id.mouse, id.keyboard)
     id.desktop.write(instPath)
 
-def handleX11Packages(dir, intf, disp, id, instPath):
-
-    if dir == DISPATCH_BACK:
-        return
-        
-    # skip X setup if it is not being installed
-    #
-    # uncomment this block if you want X configuration to be presented
-    #
-# START BLOCK
-#     if (not id.grpset.hdrlist.has_key('XFree86') or
-#         not id.grpset.hdrlist['XFree86'].isSelected()):
-#         disp.skipStep("videocard")
-#         disp.skipStep("monitor")
-#         disp.skipStep("xcustom")
-#         disp.skipStep("writexconfig")
-#         id.xsetup.skipx = 1
-#     elif disp.stepInSkipList("videocard"):
-#         # if X is being installed, but videocard step skipped
-#         # need to turn it back on
-#         disp.skipStep("videocard", skip=0)
-#         disp.skipStep("monitor", skip=0)
-#         disp.skipStep("xcustom", skip=0)
-#         disp.skipStep("writexconfig", skip=0)
-#         id.xsetup.skipx = 0
-# END BLOCK
-
-    # set default runlevel based on packages
-    gnomeSelected = (id.grpset.hdrlist.has_key('gnome-session')
-                     and id.grpset.hdrlist['gnome-session'].isSelected())
-    gdmSelected = (id.grpset.hdrlist.has_key('gdm')
-                     and id.grpset.hdrlist['gdm'].isSelected())
-    kdeSelected = (id.grpset.hdrlist.has_key('kdebase')
-                   and id.grpset.hdrlist['kdebase'].isSelected())
-    xinstalled = ((id.grpset.hdrlist.has_key('xorg-x11')
-                   and id.grpset.hdrlist['xorg-x11'].isSelected()) or
-                  (id.grpset.hdrlist.has_key('XFree86')
-                   and id.grpset.hdrlist['XFree86'].isSelected()))
-
-    if gnomeSelected:
-        id.desktop.setDefaultDesktop("GNOME")
-    elif kdeSelected:
-        id.desktop.setDefaultDesktop("KDE")
-
-    if (gdmSelected or kdeSelected) and (xinstalled) and (not flags.serial) and (not flags.virtpconsole):
-        id.desktop.setDefaultRunLevel(5)
-    else:
-        id.desktop.setDefaultRunLevel(3)        
-
-# verifies that monitor is not Unprobed, and if so we can skip monitor question
-def checkMonitorOK(monitor, dispatch):
-    rc = 0
-    if monitor is not None:
-	if monitor.getMonitorID() != "Unprobed Monitor":
-	    rc = 1
-
-    dispatch.skipStep("monitor", skip=rc)
-
-# sets a reasonable default for X settings.
-def setSaneXSettings(xsetup):
-    if xsetup is not None and xsetup.xhwstate is not None:
-	if not xsetup.imposed_sane_default:
-	    # XXX HACK see if we have a user specified LCD display
-	    import re
-	    
-	    regx = re.compile("LCD Panel .*x.*")
-	    monid = xsetup.xhwstate.monitor.getMonitorID()
-	    lcdres = None
-	    if regx.match(monid):
-		for testres in ["640x480", "800x600", "1024x480", "1024x768",
-				"1280x960", "1280x1024", "1400x1050",
-				"1600x1200"]:
-		    if string.find(monid, testres) != -1:
-			lcdres = testres
-			break
-		
-	    if lcdres is not None:
-		xsetup.xhwstate.set_resolution(lcdres)
-	    else:
-		xsetup.xhwstate.choose_sane_default()
-		xsetup.imposed_sane_default = 1
-	    
 def doMigrateFilesystems(dir, thefsset, diskset, upgrade, instPath):
     if dir == DISPATCH_BACK:
         return DISPATCH_NOOP
@@ -280,90 +198,6 @@ def setupTimezone(timezone, upgrade, instPath, dir):
     except RuntimeError:
         log.error("Failed to set clock")
 
-# do miscellaneous package selections based on other installation selections
-def handleMiscPackages(intf, id, dir):
-    if dir == DISPATCH_BACK:
-        return
-
-    arch = iutil.getArch ()
-
-    # this is a crappy hack, but I don't want bug reports from these people
-    if (arch == "i386") and (not id.grpset.hdrlist.has_key("kernel")):
-        intf.messageWindow(_("Error"),
-                           _("You are trying to install on a machine "
-                             "which isn't supported by this release of "
-                             "%s.") %(productName,),
-                           type="custom", custom_icon="error",
-                           custom_buttons=[_("_Exit")])
-        sys.exit(0)
-
-    # shorthand
-    upgrade = id.getUpgrade()
-
-    def select(hdrlist, name):
-        if hdrlist.has_key(name):
-            hdrlist[name].select(isManual = 1)
-            return 1
-        return 0
-
-    def selected(hdrlist, name):
-        if hdrlist.has_key(name) and hdrlist[name].isSelected():
-            return 1
-        return 0
-
-    if not upgrade:
-        foundkernel = 0
-	if isys.smpAvailable() or isys.htavailable():
-            if id.grpset.hdrlist.has_key("kernel-smp") and \
-               id.grpset.hdrlist["kernel-smp"][rpm.RPMTAG_ARCH] == \
-               id.grpset.hdrlist["kernel"][rpm.RPMTAG_ARCH]:
-                if select(id.grpset.hdrlist, 'kernel-smp'):
-                    foundkernel = 1
-                    if selected(id.grpset.hdrlist, "gcc"):
-                        select(id.grpset.hdrlist, "kernel-smp-devel")
-
-        if foundkernel == 0:
-            # we *always* need to have some sort of kernel installed
-            select(id.grpset.hdrlist, 'kernel')
-            
-        if (selected(id.grpset.hdrlist, "gcc") and
-            selected(id.grpset.hdrlist, "kernel")):
-            select(id.grpset.hdrlist, "kernel-devel")
-
-	# if NIS is configured, install ypbind and dependencies:
-	if id.auth.find("--enablenis") != -1:
-            select(id.grpset.hdrlist, 'ypbind')
-            select(id.grpset.hdrlist, 'yp-tools')
-            select(id.grpset.hdrlist, 'portmap')
-
-	if id.auth.find("--enableldap") != -1:
-            select(id.grpset.hdrlist, 'nss_ldap')
-            select(id.grpset.hdrlist, 'openldap')
-            select(id.grpset.hdrlist, 'perl')
-
-	if id.auth.find("--enablekrb5") != -1:
-            select(id.grpset.hdrlist, 'pam_krb5')
-            select(id.grpset.hdrlist, 'krb5-workstation')
-            select(id.grpset.hdrlist, 'krbafs')
-            select(id.grpset.hdrlist, 'krb5-libs')
-
-	if id.auth.find("--enablesmbauth") != -1:
-            select(id.grpset.hdrlist, 'pam_smb')
-
-        if iutil.getArch() == "i386" and id.bootloader.useGrubVal == 1:
-            select(id.grpset.hdrlist, 'grub')
-        elif iutil.getArch() == "s390":
-            select(id.grpset.hdrlist, 's390utils')
-        elif iutil.getArch() == "ppc":
-            select(id.grpset.hdrlist, 'yaboot')
-        elif iutil.getArch() == "ia64":
-            select(id.grpset.hdrlist, 'elilo')
-
-        for entry in id.fsset.entries:
-            for pkg in entry.fsystem.getNeededPackages():
-                if select(id.grpset.hdrlist, pkg):
-                    log.info("Needed %s for %s" %(pkg, entry.getMountPoint()))
-
 def doPostInstall(method, id, intf, instPath):
     if flags.test:
 	return