more merging fun from the hampton branch. I'm pretty sure this doesn't

work now, at least in gui.  text mode might, though

1 files changed, 5 insertions, 3 deletions

diff --git a/image.py b/image.py
index b34cfc284..8bf43b757 100644
--- a/image.py
+++ b/image.py
@@ -113,6 +113,9 @@ class CdromInstallMethod(ImageInstallMethod):
 		if done:
 		    break
 
+		if done:
+		    break
+
 	    if not done:
 		isys.ejectCdrom(self.device)
 
@@ -133,6 +136,8 @@ class CdromInstallMethod(ImageInstallMethod):
 			f.close()
 			if newStamp == timestamp:
 			    done = 1
+                            # make /tmp/cdrom again so cd gets ejected
+                            isys.makeDevInode(self.device, "/tmp/cdrom")
 
 		    if not done:
 			self.messageWindow(_("Wrong CDROM"),
@@ -174,8 +179,6 @@ def findIsoImages(path, messageWindow):
     arch = iutil.getArch()
     discImages = {}
 
-    print "need to look at", files
-
     for file in files:
 	what = path + '/' + file
 	if not isys.isIsoImage(what): continue
@@ -262,7 +265,6 @@ class NfsIsoInstallMethod(NfsInstallMethod):
 	# images the same way -- we use loop3 for everything
 
 	self.discImages = findIsoImages(tree, messageWindow)
-	print "found", self.discImages, "in tree", tree
 	self.mountImage(1)
 
 	ImageInstallMethod.__init__(self, self.mntPoint)