36 lines
1.6 KiB
Diff
36 lines
1.6 KiB
Diff
From adcb2e23312914535dd71b15d4705c8101055836 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
|
|
Date: Tue, 6 Mar 2018 08:47:17 +0100
|
|
Subject: [PATCH 3/8] pkgset: Correctly detect single tag for variant
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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://pagure.io/pungi/issue/860
|
|
Relates: https://bugzilla.redhat.com/show_bug.cgi?id=1551653
|
|
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
|
|
---
|
|
pungi/phases/pkgset/sources/source_koji.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/pungi/phases/pkgset/sources/source_koji.py b/pungi/phases/pkgset/sources/source_koji.py
|
|
index 98eed625..17d66773 100644
|
|
--- a/pungi/phases/pkgset/sources/source_koji.py
|
|
+++ b/pungi/phases/pkgset/sources/source_koji.py
|
|
@@ -305,7 +305,7 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event_id):
|
|
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))
|
|
--
|
|
2.13.6
|
|
|