From ffe41f267a065723f46c6639803c618147c5c2a3 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Apr 06 2020 07:07:30 +0000
Subject: 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

---

diff --git a/hub/kojihub.py b/hub/kojihub.py
index 4390079..cd8b4c9 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -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