did not read how these classes interacted well enough the first time. I've test this fix with NFS tree-based and NFS ISO.

1 files changed, 23 insertions, 17 deletions

diff --git a/image.py b/image.py
index b57917c8c..836c15a88 100644
--- a/image.py
+++ b/image.py
@@ -45,23 +45,6 @@ class ImageInstallMethod(InstallMethod):
             raise FileCopyException
 	hl = HeaderListFromFile(self.tree + "/RedHat/base/hdlist")
 
-	# 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):
@@ -432,6 +415,29 @@ class NfsIsoInstallMethod(NfsInstallMethod):
 
 	return self.mntPoint + "/RedHat/RPMS/" + h[1000000]
 
+    def readHeaders(self):
+	hl = NfsInstallMethod.readHeaders(self)
+
+	# 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 umountImage(self):
 	if self.imageMounted:
 	    isys.umount(self.mntPoint)