Changed how we acquire release notes so that we now try to pull it for all install methods. Have tested on all installmethods but CDROM. Only shortcoming presently is 1) It mount/umount the HD image loopback alot of times in process finding the matching file for your lang (we try lots of variations), and 2) lots of IOError warnings on VC3 for HTTP installs for same reason.

1 files changed, 29 insertions, 1 deletions

diff --git a/harddrive.py b/harddrive.py
index 1ad7840de..a946b4594 100644
--- a/harddrive.py
+++ b/harddrive.py
@@ -103,7 +103,35 @@ class HardDriveInstallMethod(InstallMethod):
 	self.umountMedia()
 	return cs
 
-    def getFilename(self, h, timer, callback=None):
+    # return reference to file specified on ISO #1
+    #
+    # mounts ISO #1, copies file to destdir, umounts ISO #1
+    #
+    # will probably do bad things if called during package installation
+    #
+    # returns None if file doesn't exist
+    def getFilename(self, filename, callback=None, destdir=None, retry=1):
+	if destdir is None:
+	    tmppath = self.getTempPath()
+	else:
+	    tmppath = destdir
+	    
+        fn = tmppath + '/' + os.path.basename(filename)
+
+	self.mountMedia(1)
+	try:
+	    shutil.copy(self.tree + '/' + filename, fn)
+	except:
+	    fn = None
+	    
+        self.umountMedia()
+
+	return fn
+
+
+    # return reference to the RPM file specified by the header
+    # will mount the appropriate ISO image as required by CD # in header
+    def getRPMFilename(self, h, timer, callback=None):
 	if self.mediaIsMounted != h[1000002]:
 	    self.umountMedia()
 	    self.mountMedia(h[1000002])