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

Don't pass block list in bare merge mode

Browse source 
Related: https://pagure.io/koji/issue/1404

mergerepos_c doesn't allow -b without --koji
This commit is contained in:
Mike McLean 2019-06-18 16:56:49 -04:00
parent bc16f4e5c1
commit 0899f74de3
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
builder/kojid
View file

@ -5201,8 +5201,10 @@ class CreaterepoTask(BaseTaskHandler):
else:
cmd = ['/usr/libexec/kojid/mergerepos']
cmd.extend(['--tempdir', self.workdir])
blocklist = self.repodir + '/blocklist'
cmd.extend(['-a', arch, '-b', blocklist, '-o', self.outdir])
if merge_mode != 'bare':
blocklist = self.repodir + '/blocklist'
cmd.extend(['-b', blocklist])
cmd.extend(['-a', arch, '-o', self.outdir])
if os.path.isfile(groupdata):
cmd.extend(['-g', groupdata])
for repo in repos: