particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

don't depend on a specific version of a pykickstart RepoData class

Browse source
This commit is contained in:
Mike Bonnet 2009-09-29 18:05:34 -04:00
parent cfa34bc744
commit dd0f48e752
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
builder/kojid
View file

@ -59,8 +59,7 @@ from optparse import OptionParser
from StringIO import StringIO
from xmlrpclib import Fault
import pykickstart.parser as ksparser
import pykickstart.version as ksversion
import pykickstart.commands.repo as ksrepo
import pykickstart.handlers.control as kscontrol
import hashlib
import iso9660 # from pycdio
@ -2241,8 +2240,10 @@ class LiveCDTask(BaseTaskHandler):
# in the kickstart file. If --repo wasn't specified, then we use the
# repo associated with the target passed in initially.
self.uploadFile(kspath) # upload the original ks file
version = ksversion.makeVersion()
version = ksparser.makeVersion()
ks = ksparser.KickstartParser(version)
repo_class = kscontrol.dataMap[ks.version]['RepoData']
try:
ks.readKickstart(kspath)
except IOError, (err, msg):
@ -2257,8 +2258,8 @@ class LiveCDTask(BaseTaskHandler):
user_repos = opts['repo'].split(',')
index = 0
for user_repo in user_repos:
ks.handler.repo.repoList.append(ksrepo.F8_RepoData(
baseurl=user_repo, name='koji_override_%s' % index))
ks.handler.repo.repoList.append(repo_class(baseurl=user_repo,
name='koji-override-%i' % index))
index += 1
else:
topurl = getattr(options, 'topurl')
@ -2269,8 +2270,9 @@ class LiveCDTask(BaseTaskHandler):
target_info['build_tag_name'])
baseurl = '%s/%s' % (repopath, arch)
self.logger.debug('BASEURL: %s' % baseurl)
ks.handler.repo.repoList.append(ksrepo.F8_RepoData(
baseurl=baseurl, name='koji'))
ks.handler.repo.repoList.append(repo_class(baseurl=baseurl,
name='koji-%s-%i' % (target_info['build_tag_name'],
repo_info['id'])))
# Write out the new ks file. Note that things may not be in the same
# order and comments in the original ks file may be lost.