PR#2127: fix sanity check in merge_scratch

Merges #2127
https://pagure.io/koji/pull-request/2127

Fixes: #2126
https://pagure.io/koji/issue/2126
mergeScratch API does not accept scratch build
This commit is contained in:
Tomas Kopecek 2020-04-06 09:07:30 +02:00
commit ffe41f267a

View file

@ -6834,7 +6834,7 @@ def merge_scratch(task_id):
raise koji.ImportError('task %s did not complete successfully' % task_id)
if task_info['method'] != 'build':
raise koji.ImportError('task %s is not a build task' % task_id)
if not task_params.get('scratch'):
if not task_params.get('opts', {}).get('scratch'):
raise koji.ImportError('task %s is not a scratch build' % task_id)
# sanity check the task, and extract data required for import