summaryrefslogtreecommitdiffstats
path: root/yuminstall.py
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2009-09-08 17:44:05 -0400
committerChris Lumens <clumens@redhat.com>2009-09-09 10:15:34 -0400
commit01c337e5cb25dd08a6dfbaf39a69cc19db7a78c3 (patch)
treef6861e9c5a121849f76f87f3f574d002c7e3aef4 /yuminstall.py
parent4e7ccaee60c0a2b4627fa7973f9d9001280e5067 (diff)
downloadanaconda-01c337e5cb25dd08a6dfbaf39a69cc19db7a78c3.tar.gz
anaconda-01c337e5cb25dd08a6dfbaf39a69cc19db7a78c3.tar.xz
anaconda-01c337e5cb25dd08a6dfbaf39a69cc19db7a78c3.zip
No longer copy over the CD/DVD repodata or repo config file (#521358).
These were mostly being copied over to help pirut so it could automatically know to look at the installation media for more packages. However, pirut is dead and none of the other tools support this concept anymore. Also, most people don't have their CD/DVD mounted or handy most of the time.
Diffstat (limited to 'yuminstall.py')
-rw-r--r--yuminstall.py18
1 files changed, 1 insertions, 17 deletions
diff --git a/yuminstall.py b/yuminstall.py
index b247b52de..b3d55f94c 100644
--- a/yuminstall.py
+++ b/yuminstall.py
@@ -1033,23 +1033,7 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon
fd.close()
def complete(self, anaconda):
- if anaconda.mediaDevice:
- try:
- shutil.copyfile("%s/media.repo" % self.ayum.tree,
- "%s/etc/yum.repos.d/%s-install-media.repo" %(anaconda.rootPath, productName))
- except Exception, e:
- log.debug("Error copying media.repo: %s" %(e,))
-
- try:
- i = iniparse.ConfigParser()
- i.read("%s/media.repo" % self.ayum.tree)
- repo = i.sections()[0]
- del i
- shutil.copytree("%s/repodata" % self.ayum.tree,
- "%s/var/cache/yum/%s" %(anaconda.rootPath, repo))
- except Exception, e:
- log.debug("Error setting up media repository: %s" %(e,))
- elif os.path.exists(self.ayum.tree) and os.path.ismount(self.ayum.tree):
+ if not anaconda.mediaDevice and os.path.ismount(self.ayum.tree):
isys.umount(self.ayum.tree)
anaconda.backend.removeInstallImage()