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

use name_or_id_clause in get_build_targets

Browse source
This commit is contained in:
Mike McLean 2021-11-10 13:11:38 -05:00 • committed by Tomas Kopecek
parent f87d1c3479
commit c87eba6bcd
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
hub/kojihub.py
View file

@ -3185,22 +3185,22 @@ def get_build_targets(info=None, event=None, buildTagID=None, destTagID=None, qu
'tag AS tag1 ON build_target_config.build_tag = tag1.id',
'tag AS tag2 ON build_target_config.dest_tag = tag2.id']
clauses = [eventCondition(event)]
values = {}
if info:
if isinstance(info, str):
clauses.append('build_target.name = %(info)s')
elif isinstance(info, int):
clauses.append('build_target.id = %(info)i')
else:
raise koji.GenericError('Invalid type for lookup: %s' % type(info))
clause, c_values = name_or_id_clause(info, table='tag')
clauses.append(clause)
values.update(c_values)
if buildTagID is not None:
clauses.append('build_tag = %(buildTagID)i')
values['buildTagID'] = buildTagID
if destTagID is not None:
clauses.append('dest_tag = %(destTagID)i')
values['destTagID'] = destTagID
query = QueryProcessor(columns=[f[0] for f in fields], aliases=[f[1] for f in fields],
tables=['build_target_config'], joins=joins, clauses=clauses,
values=locals(), opts=queryOpts)
values=values, opts=queryOpts)
return query.execute()