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

adjust option name to: use_createrepo_c

Browse source
This commit is contained in:
Mike McLean 2015-12-11 16:49:37 -05:00
parent cfe69773c2
commit a2ed2beb38
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
builder/kojid
View file

@ -4311,7 +4311,7 @@ class CreaterepoTask(BaseTaskHandler):
def create_local_repo(self, rinfo, arch, pkglist, groupdata, oldrepo): def create_local_repo(self, rinfo, arch, pkglist, groupdata, oldrepo):
koji.ensuredir(self.outdir) koji.ensuredir(self.outdir)
if self.options.createrepo_c: if self.options.use_createrepo_c:
cmd = ['/usr/bin/createrepo_c'] cmd = ['/usr/bin/createrepo_c']
else: else:
cmd = ['/usr/bin/createrepo'] cmd = ['/usr/bin/createrepo']
@ -4364,7 +4364,7 @@ class CreaterepoTask(BaseTaskHandler):
repos.append(ext_url) repos.append(ext_url)
blocklist = self.repodir + '/blocklist' blocklist = self.repodir + '/blocklist'
if self.options.createrepo_c: if self.options.use_createrepo_c:
cmd = ['/usr/bin/mergerepo_c', '--koji'] cmd = ['/usr/bin/mergerepo_c', '--koji']
else: else:
cmd = ['/usr/libexec/kojid/mergerepos'] cmd = ['/usr/libexec/kojid/mergerepos']
@ -4539,7 +4539,7 @@ def get_options():
'keepalive' : True, 'keepalive' : True,
'timeout' : None, 'timeout' : None,
'use_fast_upload': True, 'use_fast_upload': True,
'createrepo_c': False, 'use_createrepo_c': False,
'createrepo_skip_stat': True, 'createrepo_skip_stat': True,
'createrepo_update': True, 'createrepo_update': True,
'pkgurl': None, 'pkgurl': None,
@ -4562,7 +4562,7 @@ def get_options():
defaults[name] = int(value) defaults[name] = int(value)
except ValueError: except ValueError:
quit("value for %s option must be a valid integer" % name) quit("value for %s option must be a valid integer" % name)
elif name in ['offline_retry', 'createrepo_c', 'createrepo_skip_stat', elif name in ['offline_retry', 'use_createrepo_c', 'createrepo_skip_stat',
'createrepo_update', 'keepalive', 'use_fast_upload', 'createrepo_update', 'keepalive', 'use_fast_upload',
'support_rpm_source_layout']: 'support_rpm_source_layout']:
defaults[name] = config.getboolean('kojid', name) defaults[name] = config.getboolean('kojid', name)

2
builder/kojid.conf
View file

@ -42,7 +42,7 @@ server=http://hub.example.com/kojihub
topurl=http://hub.example.com/kojifiles topurl=http://hub.example.com/kojifiles
; use createrepo_c rather than createrepo ; use createrepo_c rather than createrepo
; createrepo_c=False ; use_createrepo_c=False
; A space-separated list of tuples from which kojid is allowed to checkout. ; A space-separated list of tuples from which kojid is allowed to checkout.
; The format of those tuples is: ; The format of those tuples is: