diff --git a/builder/kojid b/builder/kojid index 67ae6e21..c8c5a62e 100755 --- a/builder/kojid +++ b/builder/kojid @@ -4311,7 +4311,7 @@ class CreaterepoTask(BaseTaskHandler): def create_local_repo(self, rinfo, arch, pkglist, groupdata, oldrepo): koji.ensuredir(self.outdir) - if self.options.createrepo_c: + if self.options.use_createrepo_c: cmd = ['/usr/bin/createrepo_c'] else: cmd = ['/usr/bin/createrepo'] @@ -4364,7 +4364,7 @@ class CreaterepoTask(BaseTaskHandler): repos.append(ext_url) blocklist = self.repodir + '/blocklist' - if self.options.createrepo_c: + if self.options.use_createrepo_c: cmd = ['/usr/bin/mergerepo_c', '--koji'] else: cmd = ['/usr/libexec/kojid/mergerepos'] @@ -4539,7 +4539,7 @@ def get_options(): 'keepalive' : True, 'timeout' : None, 'use_fast_upload': True, - 'createrepo_c': False, + 'use_createrepo_c': False, 'createrepo_skip_stat': True, 'createrepo_update': True, 'pkgurl': None, @@ -4562,7 +4562,7 @@ def get_options(): defaults[name] = int(value) except ValueError: 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', 'support_rpm_source_layout']: defaults[name] = config.getboolean('kojid', name) diff --git a/builder/kojid.conf b/builder/kojid.conf index 4808ff10..044a0788 100644 --- a/builder/kojid.conf +++ b/builder/kojid.conf @@ -42,7 +42,7 @@ server=http://hub.example.com/kojihub topurl=http://hub.example.com/kojifiles ; 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. ; The format of those tuples is: