PR#861: pkgset: Correctly detect single tag for variant - pungi

pungi

#861 pkgset: Correctly detect single tag for variant

Merged 6 years ago by lsedlar. Opened 6 years ago by lsedlar.

lsedlar/pungi fix-merging-variant-pkgset into master

pkgset: Correctly detect single tag for variant

Lubomír Sedlář • 6 years ago

6514dc8

pungi/phases/pkgset/sources/source_koji.py

file modified

+1 -1

		`@@ -320,7 +320,7 @@`
		`if compose_tag in variant_tags[variant]:`
		`# Optimization for case where we have just single compose`
		`# tag - we do not have to merge in this case...`
		`- if len(compose_tags) == 1:`
		`+ if len(variant_tags[variant]) == 1:`
		`variant.pkgset = pkgset`
		`else:`
		`variant.pkgset.merge(pkgset, None, list(all_arches))`

lsedlar commented 6 years ago

We need to check tags for the variant, not for the whole compose. This results in merge always being done even if there is a single tag. For f29 tag in Fedora this takes about 2 hours for each variant.

Relates: https://bugzilla.redhat.com/show_bug.cgi?id=1551653

CC @jkaluza

lsedlar commented 6 years ago

This should save about 18 hours for Rawhide and Branched.

rebased onto 6514dc8

6 years ago