From cf114a7fabcb6c5394c0424dfe8006e4ced2eb81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= Date: Mon, 27 Nov 2017 08:18:12 +0100 Subject: [PATCH] pkgset: Remove package skip optimization for bootable products MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If buildinstall is supposed to run, we can't pick only some packages from the tag. The temporary repo is used as a source for lorax. There could very well be packages not meant to be shipped in the compose that are still essential for building the bootable images. Signed-off-by: Lubomír Sedlář --- pungi/phases/pkgset/sources/source_koji.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pungi/phases/pkgset/sources/source_koji.py b/pungi/phases/pkgset/sources/source_koji.py index 2855320b..1f5f0337 100644 --- a/pungi/phases/pkgset/sources/source_koji.py +++ b/pungi/phases/pkgset/sources/source_koji.py @@ -200,12 +200,13 @@ def populate_global_pkgset(compose, koji_wrapper, path_prefix, event_id): variant_tags = {} # In case we use "nodeps" gather_method, we might now the final list of - # packages which will end up in the compose even now, so instead of - # reading all the packages from Koji tag, we can just cherry-pick the ones - # which are really needed to do the compose and safe lot of time and - # resources here. + # packages which will end up in the compose even now, so instead of reading + # all the packages from Koji tag, we can just cherry-pick the ones which + # are really needed to do the compose and safe lot of time and resources + # here. This only works if we are not creating bootable images. Those could + # include packages that are not in the compose. packages_to_gather = [] - if compose.conf["gather_method"] == "nodeps": + if compose.conf["gather_method"] == "nodeps" and not compose.conf.get('bootable'): packages_to_gather, groups = get_packages_to_gather( compose, include_arch=False, include_prepopulated=True) if groups: