use separate timer for install which can be stopped and started

1 files changed, 6 insertions, 2 deletions

diff --git a/image.py b/image.py
index b6bf55fb3..244524028 100644
--- a/image.py
+++ b/image.py
@@ -16,7 +16,7 @@ class ImageInstallMethod(InstallMethod):
     def readComps(self, hdlist):
 	return ComponentSet(self.tree + '/RedHat/base/comps', hdlist)
 
-    def getFilename(self, h):
+    def getFilename(self, h, timer):
 	return self.tree + "/RedHat/RPMS/" + h[1000000]
 
     def readHeaders(self):
@@ -63,11 +63,13 @@ class CdromInstallMethod(ImageInstallMethod):
 	isys.makeDevInode("loop0", "/tmp/loop")
 	isys.lochangefd("/tmp/loop", self.loopbackFile)
 
-    def getFilename(self, h):
+    def getFilename(self, h, timer):
         if h[1000002] == None:
             log ("header for %s has no disc location tag, assuming it's"
                  "on the current CD", h[1000000])
         elif h[1000002] != self.currentDisc:
+	    timer.stop()
+
 	    self.currentDisc = h[1000002]
 	    isys.umount("/mnt/source")
 
@@ -116,6 +118,8 @@ class CdromInstallMethod(ImageInstallMethod):
 		    self.messageWindow(_("Error"), 
 			    _("The CDROM could not be mounted."))
 
+	    timer.start()
+
 	return self.tree + "/RedHat/RPMS/" + h[1000000]
 
     def filesDone(self):