PR#4061: kiwi: Only add buildroot repo if user repositories are not defined - koji

koji

#4061 kiwi: Only add buildroot repo if user repositories are not defined

Closed a year ago by ngompa. Opened a year ago by ngompa.

ngompa/koji kiwibuild-reposfix into master

kiwi: Only add buildroot repo if user repositories are not defined

Neal Gompa • a year ago

9042f1e

plugins/builder/kiwi.py

file modified

+7 -6

		`@@ -351,12 +351,13 @@`

		`# 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'):`

ngompa commented a year ago

In general, we assume that if the user is specifying repositories,
the built-in one should not be used.

ngompa commented a year ago

This should fix the issue we're seeing in the F40 image composes with unsigned packages.

CC: @kevin @adamwill

kevin commented a year ago

I tested this in our stg env and it seemed to do the right thing.

tkopecek commented a year ago

Does it make sense to make it configurable? I can imagine a case when buildroot repo is used and some additional content is being installed on top of it. But maybe there is no real case like this.

kevin commented a year ago

I suppose there could be a use case... I can't think of why off hand. ;)

I suppose if you wanted the buildroot repo and another one you could just pass both those in? Although thats less handy...

ngompa commented a year ago

I guess in theory this might be the case in other Koji deployments, particularly ones where people use Koji to build appliances.

tkopecek commented a year ago

So, something like #4063?

kevin commented a year ago

That should work for our needs I think... sure.

ngompa commented a year ago

Closing for #4063.

Pull-Request has been closed by ngompa