- Add support for $releasever in repo uris.

This commit is contained in:
Jesse Keating 2007-08-27 10:33:28 -04:00 committed by Jesse Keating
parent 5c70f43906
commit c53ff26201
2 changed files with 6 additions and 1 deletions

View File

@ -1,5 +1,6 @@
* Mon Aug 27 2007 Jesse Keating <jkeating@redhat.com> * Mon Aug 27 2007 Jesse Keating <jkeating@redhat.com>
- Set up arch in __init__.py as it's needed for logging - Set up arch in __init__.py as it's needed for logging
- Add support for $releasever in repo uris.
* Sun Aug 26 2007 Jesse Keating <jkeating@redhat.com> * Sun Aug 26 2007 Jesse Keating <jkeating@redhat.com>
- Add better support for %packages syntax using native pykickstart - Add better support for %packages syntax using native pykickstart

View File

@ -87,6 +87,9 @@ class Gather(pypungi.PungiBase):
yumconf.installroot = os.path.join(self.workdir, 'yumroot') yumconf.installroot = os.path.join(self.workdir, 'yumroot')
yumconf.uid = os.geteuid() yumconf.uid = os.geteuid()
yumconf.cache = 0 yumconf.cache = 0
yumvars = yum.config._getEnvVar()
yumvars['releasever'] = self.config.get('default', 'version')
yumconf.yumvar = yumvars
self.ayum._conf = yumconf self.ayum._conf = yumconf
self.ayum.repos.setCacheDir(self.ayum.conf.cachedir) self.ayum.repos.setCacheDir(self.ayum.conf.cachedir)
@ -119,7 +122,8 @@ class Gather(pypungi.PungiBase):
else: else:
thisrepo.baseurl = repo.baseurl thisrepo.baseurl = repo.baseurl
self.logger.info('URI for repo %s is %s' % (repo.name, repo.baseurl)) self.logger.info('URI for repo %s is %s' % (repo.name, repo.baseurl))
self.ayum._repos.add(thisrepo) thisrepo.yumvar.update(self.ayum.conf.yumvar)
self.ayum.repos.add(thisrepo)
for repo in self.ayum.repos.repos.values(): for repo in self.ayum.repos.repos.values():
self.logger.info('Enabling repo %s' % repo.name) self.logger.info('Enabling repo %s' % repo.name)