almalinux
/
pungi
15
1
Fork 0
Code Issues Pull Requests Releases Activity

Fix some typos and handle the fact that baseurl is a list, where as mirrorlist isn't.

This commit is contained in:
Jesse Keating 2008-06-13 13:47:31 -04:00
parent 379020e5c5
commit 3b955cc823
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pypungi/__init__.py
View File

@ -178,11 +178,11 @@ class Pungi(pypungi.PungiBase):
# add excludes and such here when pykickstart gets them # add excludes and such here when pykickstart gets them
if repo.mirrorlist: if repo.mirrorlist:
thisrepo.mirrorlist = yum.parser.varReplace(repo.mirrorlist, self.ayum.conf.yumvar) thisrepo.mirrorlist = yum.parser.varReplace(repo.mirrorlist, self.ayum.conf.yumvar)
self.mirrorlists.extend('thisrepo.mirrorlist') self.mirrorlists.append(thisrepo.mirrorlist)
self.logger.info('Mirrorlist for repo %s is %s' % (thisrepo.name, thisrepo.mirrorlist)) self.logger.info('Mirrorlist for repo %s is %s' % (thisrepo.name, thisrepo.mirrorlist))
else: else:
thisrepo.baseurl = yum.parser.varReplace(repo.baseurl, self.ayum.conf.yumvar) thisrepo.baseurl = yum.parser.varReplace(repo.baseurl, self.ayum.conf.yumvar)
self.repos.extend('thisrepo.baseurl') self.repos.extend(thisrepo.baseurl)
self.logger.info('URL for repo %s is %s' % (thisrepo.name, thisrepo.baseurl)) self.logger.info('URL for repo %s is %s' % (thisrepo.name, thisrepo.baseurl))
thisrepo.basecachedir = self.ayum.conf.cachedir thisrepo.basecachedir = self.ayum.conf.cachedir
thisrepo.enablegroups = True thisrepo.enablegroups = True
@ -584,12 +584,12 @@ class Pungi(pypungi.PungiBase):
buildinstall.append('--bugurl') buildinstall.append('--bugurl')
buildinstall.append(self.config.get('default', 'bugurl')) buildinstall.append(self.config.get('default', 'bugurl'))
buildinstall.append'--output') buildinstall.append('--output')
buildinstall.append(self.topdir) buildinstall.append(self.topdir)
for mirrorlist in self.mirrorlists: for mirrorlist in self.mirrorlists:
buildinstall.append('--mirrorlist') buildinstall.append('--mirrorlist')
buildinstall.append(mirorrlist) buildinstall.append(mirrorlist)
buildinstall.append(self.topdir) buildinstall.append(self.topdir)