particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix repo handing for bare wrapperRPM task

Browse source 
Fixes: https://pagure.io/koji/issue/4266
This commit is contained in:
Mike McLean 2024-11-19 15:07:54 -05:00 • committed by Tomas Kopecek
parent fccf4fa3f9
commit d18aacfc5a
3 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
builder/kojid
View file

@ -2248,13 +2248,17 @@ class WrapperRPMTask(BaseBuildTask):
error_msg = 'custom_user_metadata is not JSON serializable'
raise koji.BuildError(error_msg)
# sort out remaining buildroot params
build_tag = self.session.getTag(build_target['build_tag'], strict=True)
repo_id = opts.get('repo_id')
if not repo_id:
raise koji.BuildError("A repo id must be provided")
repo_info = self.session.repoInfo(repo_id, strict=True)
# a parent task will generally pass in the repo it used, but if
# we are top level, we'll need to find our own
repo_info = self.getRepo(build_tag['id'])
else:
repo_info = self.session.repoInfo(repo_id, strict=True)
repo_id = repo_info['id']
event_id = repo_info['create_event']
build_tag = self.session.getTag(build_target['build_tag'], strict=True)
br_arch = self.find_arch('noarch', self.session.host.getHost(
), self.session.getBuildConfig(build_tag['id'], event=event_id))