From efa88a95667a29cab318d8b6182fbc1d14b56f53 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Jun 28 2019 19:43:50 +0000 Subject: kojibuilder: Pass mergerepo_c --all for bare mode as well. The '--koji' mode of mergerepo_c implies --all, and thats what we want for bare mode as well. The default merge mode is 'repo' which uses the first found package by name if multiple packages with the same name are in the multiple repos. This causes chaos with rhel8 repos as GA and updates content are in the same repo and if it hits an old version of one package and an update of another that depends on the new version it blows up. Signed-off-by: Kevin Fenzi --- diff --git a/builder/kojid b/builder/kojid index 0024e4f..d79810e 100755 --- a/builder/kojid +++ b/builder/kojid @@ -5329,7 +5329,7 @@ class CreaterepoTask(BaseTaskHandler): elif merge_mode == 'bare': # "bare" merge mode for repos with modular metadata # forces use of mergerepo_c - cmd = ['/usr/bin/mergerepo_c', '--pkgorigins'] + cmd = ['/usr/bin/mergerepo_c', '--pkgorigins', '--all'] elif self.options.use_createrepo_c: cmd = ['/usr/bin/mergerepo_c', '--koji'] else: