Remove legacy metadata handing

3 files changed, 0 insertions, 55 deletions

diff --git a/harddrive.py b/harddrive.py
index 3e586a77d..84e47bea7 100644
--- a/harddrive.py
+++ b/harddrive.py
@@ -99,13 +99,6 @@ class HardDriveInstallMethod(InstallMethod):
 	    self.tree = None
 	    self.isoDirIsMounted = 0
 	
-    def readComps(self, hdlist):
-	self.mountMedia(1)
-	fname = self.findBestFileMatch('comps.xml')
-        cs = groupSetFromCompsFile(fname, hdlist)
-	self.umountMedia()
-	return cs
-
     # return reference to file specified on ISO #1
     #
     # mounts ISO #1, copies file to destdir, umounts ISO #1
@@ -143,41 +136,6 @@ class HardDriveInstallMethod(InstallMethod):
 
 	return "%s/%s/RPMS/%s" % (self.tree, productPath, h[1000000])
 
-    def readHeaders(self):
-	self.mountMedia(1)
-        if not os.access("%s/%s/base/hdlist" % (self.tree, productPath), os.R_OK):
-            self.umountMedia()
-            raise FileCopyException
-	hl = HeaderListFromFile("%s/%s/base/hdlist" % (self.tree, productPath))
-	self.umountMedia()
-
-	# Make sure all of the correct CD images are available
-	missing_images = []
-	for h in hl.values():
-	    if not self.discImages.has_key(h[1000002]):
-		if h[1000002] not in missing_images:
-		    missing_images.append(h[1000002])
-
-	if len(missing_images) > 0:
-	    missing_images.sort()
-	    missing_string = ""
-	    for missing in missing_images:
-		missing_string += "\t\t\tCD #%d\n" % (missing,)
-		
-	    self.messageWindow(_("Error"),
-			       _("The following ISO images are missing which are required for the install:\n\n%s\nThe system will now reboot.") % missing_string)
-	    sys.exit(0)
-		
-	return hl
-
-    def mergeFullHeaders(self, hdlist):
-	self.mountMedia(1)
-        if not os.access("%s/%s/base/hdlist" % (self.tree, productPath), os.R_OK):
-            self.umountMedia()
-            raise FileCopyException
-	hdlist.mergeFullHeaders("%s/%s/base/hdlist2" % (self.tree, productPath))
-	self.umountMedia()
-
     def systemMounted(self, fsset, mntPoint):
 	self.mountMedia(1)
 	    
diff --git a/image.py b/image.py
index 366cfb9bc..1bfa5a98b 100644
--- a/image.py
+++ b/image.py
@@ -96,12 +96,6 @@ def presentRequiredMediaMessage(intf, grpset):
 
 class ImageInstallMethod(InstallMethod):
 
-    def readComps(self, hdlist):
-	fname = self.findBestFileMatch('comps.xml')
-        if fname is None:
-            raise FileCopyException
-	return groupSetFromCompsFile(fname, hdlist)
-
     def getFilename(self, filename, callback=None, destdir=None, retry=1):
 	return self.tree + "/" + filename
 
diff --git a/urlinstall.py b/urlinstall.py
index 04162680b..9e4df57ba 100644
--- a/urlinstall.py
+++ b/urlinstall.py
@@ -80,13 +80,6 @@ def urlretrieve(location, file, callback=None):
     url.close()
 
 class UrlInstallMethod(InstallMethod):
-    def readComps(self, hdlist):
-	fname = self.findBestFileMatch('comps.xml')
-	# if not local then assume its on host
-	if fname is None:
-	    fname = '%s/%s/base/comps.xml' % (self.baseUrl, productPath)
-	    log.warning("Comps not in update dirs, using %s",fname)
-        return groupSetFromCompsFile(fname, hdlist)
 
     def getFilename(self, filename, callback=None, destdir=None, retry=1,
                     disc = 1):