PR#1516: kojibuilder: Pass mergerepo_c --all for bare mode as well. - koji

koji

#1516 kojibuilder: Pass mergerepo_c --all for bare mode as well.

Merged 4 years ago by mikem. Opened 4 years ago by kevin.

kevin/koji use-all-mode-for-bare-merge into master

kojibuilder: Pass mergerepo_c --all for bare mode as well.

Kevin Fenzi • 4 years ago

efa88a9

builder/kojid

file modified

+1 -1

		`@@ -5329,7 +5329,7 @@`
		`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:`

kevin commented 4 years ago

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 kevin@scrye.com

mikem commented 4 years ago

The '--koji' mode of mergerepo_c implies --all

Does it? Maybe I guess, but --koji only allows one build per package name (by looking at sourcerpm field and grouping), so it's not really "all versions". I suppose in the sketchy case where two different packages provided a subpackage of the same name that --koji mode would include both.

mikem commented 4 years ago

Filed #1546 to track

Fixes: #1546

mikem commented 4 years ago

Commit 73e1a6a fixes this pull-request