On Thu, 7 May 2015 11:53:34 -0500 Dennis Gilmore <[email protected]> wrote:
> mergerepo_c has a --koji flag to use the behaviour of kojis inbuilt > fork of mergerepo. lets use it if it is available. > > Signed-off-by: Dennis Gilmore <[email protected]> > --- > builder/kojid | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/builder/kojid b/builder/kojid > index 4e53fb5..8c0b20d 100755 > --- a/builder/kojid > +++ b/builder/kojid > @@ -4305,7 +4305,11 @@ class CreaterepoTask(BaseTaskHandler): > repos.append(ext_url) > > blocklist = self.repodir + '/blocklist' > - cmd = ['/usr/libexec/kojid/mergerepos', '-a', arch, '-b', > blocklist, '-o', self.outdir] > + if os.path.isfile('/usr/bin/mergerepo_c'): > + cmd = ['/usr/bin/mergerepo_c', '--koji'] > + else: > + cmd = ['/usr/libexec/kojid/mergerepos'] > + cmd.extend(['-a', arch, '-b', blocklist, '-o', self.outdir]) > if os.path.isfile(groupdata): > cmd.extend(['-g', groupdata]) > for repo in repos: ACK Dan -- buildsys mailing list [email protected] https://admin.fedoraproject.org/mailman/listinfo/buildsys
