try to unmount the cd if we get a failure installing a package so that the

user can eject their CD if they want and change it for one that isn't cracked
down the middle

1 files changed, 19 insertions, 1 deletions

diff --git a/image.py b/image.py
index 2a65bbaeb..fc166207e 100644
--- a/image.py
+++ b/image.py
@@ -51,12 +51,31 @@ class ImageInstallMethod(InstallMethod):
         
         return path
 
+    def unmountCD(self):
+        pass
+
     def __init__(self, tree, rootPath):
 	InstallMethod.__init__(self, rootPath)
 	self.tree = tree
 
 class CdromInstallMethod(ImageInstallMethod):
 
+    def unmountCD(self):
+        done = 0
+        while done == 0:
+            try:
+                isys.umount("/mnt/source")
+                self.currentDisc = []
+                break
+            except:
+                self.messageWindow(_("Error"),
+                                   _("An error occurred unmounting the CD.  "
+                                     "Please make sure you're not accessing "
+                                     "%s from the shell on tty2 "
+                                     "and then click OK to retry.")
+                                   % ("/mnt/source",))
+                
+
     def systemUnmounted(self):
 	if self.loopbackFile:
 	    isys.makeDevInode("loop0", "/tmp/loop")
@@ -328,7 +347,6 @@ def findIsoImages(path, messageWindow):
     return discImages
 
 class NfsIsoInstallMethod(NfsInstallMethod):
-
     def getFilename(self, h, timer):
 	if self.imageMounted != h[1000002]:
 	    self.umountImage()