From 694ac4148301ef1efb69fbef0072190e1671a356 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 20 Mar 2024 12:45:17 -0400 Subject: [PATCH 1/6] kiwi: Only add buildroot repo if user repositories are not defined In general, we assume that if the user is specifying repositories, the built-in one should not be used. --- plugins/builder/kiwi.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/plugins/builder/kiwi.py b/plugins/builder/kiwi.py index 369071ef..d5d4fbdc 100644 --- a/plugins/builder/kiwi.py +++ b/plugins/builder/kiwi.py @@ -351,12 +351,13 @@ class KiwiCreateImageTask(BaseBuildTask): # user repos repos = self.opts.get('repos', []) - # buildroot repo - path_info = koji.PathInfo(topdir=self.options.topurl) - repopath = path_info.repo(repo_info['id'], target_info['build_tag_name']) - baseurl = '%s/%s' % (repopath, arch) - self.logger.debug('BASEURL: %s' % baseurl) - repos.append(baseurl) + # buildroot repo if user repos not defined + if repos == []: + path_info = koji.PathInfo(topdir=self.options.topurl) + repopath = path_info.repo(repo_info['id'], target_info['build_tag_name']) + baseurl = '%s/%s' % (repopath, arch) + self.logger.debug('BASEURL: %s' % baseurl) + repos.append(baseurl) base_path = os.path.dirname(desc_path) if opts.get('make_prep'): -- 2.46.0