diff options
author | Chris Lumens <clumens@redhat.com> | 2009-03-24 09:34:41 -0400 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2009-03-24 09:41:46 -0400 |
commit | ed2883f06e20d2beda75e1f3fbdb5b827c31a9b0 (patch) | |
tree | edfff1b2c34d166c2d89cfb52ab0fff72481564e | |
parent | 74df7604a2bfd0af0df3c60cffb4b5b0ab325cc8 (diff) | |
download | anaconda-ed2883f06e20d2beda75e1f3fbdb5b827c31a9b0.tar.gz anaconda-ed2883f06e20d2beda75e1f3fbdb5b827c31a9b0.tar.xz anaconda-ed2883f06e20d2beda75e1f3fbdb5b827c31a9b0.zip |
Use the mount and unmount methods on OpticalDevice.format now.
-rw-r--r-- | image.py | 11 | ||||
-rw-r--r-- | yuminstall.py | 19 |
2 files changed, 15 insertions, 15 deletions
@@ -255,8 +255,7 @@ def scanForMedia(tree, storage): continue try: - if isys.mount(dev.path, tree, fstype="iso9660", readOnly=True): - continue + dev.format.mount(mountpoint=tree) except: continue @@ -273,13 +272,13 @@ def umountImage(tree, currentMedia): isys.umount(tree, removeDir=False) isys.unlosetup("/dev/loop1") -def unmountCD(path, messageWindow): - if not path: +def unmountCD(dev, messageWindow): + if not dev: return while True: try: - isys.umount(path, removeDir=False) + dev.format.unmount() break except Exception, e: log.error("exception in _unmountCD: %s" %(e,)) @@ -288,7 +287,7 @@ def unmountCD(path, messageWindow): "Please make sure you're not accessing " "%s from the shell on tty2 " "and then click OK to retry.") - % (path,)) + % (dev.path,)) def verifyMedia(tree, discnum, timestamp=None): if os.access("%s/.discinfo" % tree, os.R_OK): diff --git a/yuminstall.py b/yuminstall.py index 3bcb78d1f..dc2dde597 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -322,27 +322,28 @@ class AnacondaYum(YumSorter): self._timestamp = f.readline().strip() f.close() + dev = self.anaconda.id.storage.devicetree.getDeviceByName(self.anaconda.mediaDevice) + dev.format.mountpoint = self.tree + # If self.currentMedia is None, then there shouldn't be anything # mounted. Before going further, see if the correct disc is already # in the drive. This saves a useless eject and insert if the user # has for some reason already put the disc in the drive. if self.currentMedia is None: try: - isys.mount(self.anaconda.mediaDevice, self.tree, - fstype="iso9660", readOnly=True) + dev.format.mount() if verifyMedia(self.tree, discnum, None): self.currentMedia = discnum return - isys.umount(self.tree) + dev.format.unmount() except: pass else: - unmountCD(self.tree, self.anaconda.intf.messageWindow) + unmountCD(dev, self.anaconda.intf.messageWindow) self.currentMedia = None - dev = self.anaconda.id.storage.devicetree.getDeviceByName(self.anaconda.mediaDevice) dev.eject() while True: @@ -354,8 +355,7 @@ class AnacondaYum(YumSorter): discnum)) try: - isys.mount(self.anaconda.mediaDevice, self.tree, - fstype = "iso9660", readOnly = True) + dev.format.mount() if verifyMedia(self.tree, discnum, self._timestamp): self.currentMedia = discnum @@ -364,8 +364,9 @@ class AnacondaYum(YumSorter): self.anaconda.intf.messageWindow(_("Wrong Disc"), _("That's not the correct %s disc.") % (productName,)) - isys.umount(self.tree) - isys.ejectCdrom(self.anaconda.mediaDevice) + + dev.format.unmount() + dev.eject() except: self.anaconda.intf.messageWindow(_("Error"), _("Unable to access the disc.")) |