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

fix None draft for import_build and new_build

Browse source
This commit is contained in:
Yuming Zhu 2023-10-11 14:54:37 +08:00 • committed by Yu Ming Zhu
parent af3cfab61d
commit 75a1afc794
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
builder/kojid
View file

@ -1103,7 +1103,8 @@ class BuildTask(BaseTaskHandler):
# TODO - more pre tests
archlist = self.getArchList(build_tag, h, extra=extra_arches)
# pass draft option in
data['draft'] = opts.get('draft')
if opts.get('draft'):
data['draft'] = opts.get('draft')
# let the system know about the build we're attempting
if not self.opts.get('scratch'):
# scratch builds do not get imported
@ -1121,7 +1122,7 @@ class BuildTask(BaseTaskHandler):
self.session.host.moveBuildToScratch(self.id, srpm, rpms, logs=logs)
else:
self.session.host.completeBuild(self.id, build_id, srpm, rpms, brmap, logs=logs,
draft=opts.get('draft'))
draft=opts.get('draft') or False)
except (SystemExit, ServerExit, KeyboardInterrupt):
# we do not trap these
raise
@ -2180,7 +2181,8 @@ class WrapperRPMTask(BaseBuildTask):
if opts.get('custom_user_metadata'):
data['extra']['custom_user_metadata'] = opts['custom_user_metadata']
# pass draft option in
data['draft'] = opts.get('draft')
if opts.get('draft'):
data['draft'] = opts.get('draft')
self.logger.info("Reading package config for %(name)s" % data)
pkg_cfg = self.session.getPackageConfig(build_target['dest_tag'], data['name'])
if not opts.get('skip_tag'):
@ -2272,7 +2274,7 @@ class WrapperRPMTask(BaseBuildTask):
self.session.host.completeBuild(self.id, self.new_build_id,
relsrpm, relrpms, brmap,
{'noarch': rellogs},
draft=opts.get('draft'))
draft=opts.get('draft') or False)
except (SystemExit, ServerExit, KeyboardInterrupt):
raise
except Exception:

3
kojihub/kojihub.py
View file

@ -6069,6 +6069,8 @@ def new_build(data, strict=False):
raise koji.GenericError("No such build extra data: %(extra)r" % data)
else:
data['extra'] = None
if 'draft' in data:
data['draft'] = bool(data['draft'])
# provide a few default values
data.setdefault('state', koji.BUILD_STATES['COMPLETE'])
@ -6255,6 +6257,7 @@ def import_build(srpm, rpms, brmap=None, task_id=None, build_id=None, logs=None,
convert_value(brmap, cast=dict, check_only=True)
convert_value(srpm, cast=str, check_only=True)
convert_value(rpms, cast=list, check_only=True)
draft = bool(draft)
koji.plugin.run_callbacks('preImport', type='build', srpm=srpm, rpms=rpms, brmap=brmap,
task_id=task_id, build_id=build_id, build=None, logs=logs)
uploadpath = koji.pathinfo.work()