-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Ship it.
On Wed, 5 Aug 2009, Chris Lumens wrote:
Doing so can only result in two things: (1) /mnt/source has been removed so
teardown will fail, or (2) there's no media to eject the second time.
While I'm at it, also fix copying the media.repo file to the right location.
---
yuminstall.py | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/yuminstall.py b/yuminstall.py
index a087cbc..ca973f0 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -997,15 +997,10 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon
fd.close()
def complete(self, anaconda):
- try:
- isys.umount(self.ayum.tree)
- except Exception:
- pass
-
if anaconda.mediaDevice:
try:
shutil.copyfile("%s/media.repo" % self.ayum.tree,
- "%s/etc/anaconda.repos.d/%s-install-media.repo" %(anaconda.rootPath, productName))
+ "%s/etc/yum.repos.d/%s-install-media.repo" %(anaconda.rootPath, productName))
except Exception, e:
log.debug("Error copying media.repo: %s" %(e,))
@@ -1018,6 +1013,8 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon
"%s/var/cache/yum/%s" %(anaconda.rootPath, repo))
except Exception, e:
log.debug("Error setting up media repository: %s" %(e,))
+ else:
+ isys.umount(self.ayum.tree)
anaconda.backend.removeInstallImage()
- --
David Cantrell <dcantrell@xxxxxxxxxx>
Red Hat / Honolulu, HI
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkp5+XMACgkQ5hsjjIy1VknSnACglbTZ2RtV8TbirxL/nmawUGEl
kNsAnjLL8+nu9NdKJqKuhGme5Ineok6Q
=snao
-----END PGP SIGNATURE-----
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
