From fac7bec1c81190431ef6f955a2e175b009094e38 Mon Sep 17 00:00:00 2001
From: Clément Bénier <clement.benier@iot.bzh>
Date: Aug 18 2020 10:24:49 +0000
Subject: [PATCH 1/2] kojid: waitrepo on deleted tag


call getTag with strict=True to raise error if tag is deleted

Fixes: https://pagure.io/koji/issue/2414

Change-Id: I412de24654956216b22233e3e56c0b7ad741f6c8
Signed-off-by: Clément Bénier <clement.benier@iot.bzh>

---

diff --git a/builder/kojid b/builder/kojid
index 9f6d644..4c21147 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -6339,6 +6339,7 @@ class WaitrepoTask(BaseTaskHandler):
         last_repo = None
 
         while True:
+            taginfo = self.session.getTag(tag, strict=True)
             repo = self.session.getRepo(taginfo['id'])
             if repo and repo != last_repo:
                 if builds:

From 6f5f2abf0de1181fdb0101fedec50a30116355a2 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Aug 18 2020 10:24:49 +0000
Subject: [PATCH 2/2] kojid: more meaningful error message


Fixes: https://pagure.io/koji/issue/2414

---

diff --git a/builder/kojid b/builder/kojid
index 4c21147..088932e 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -6339,7 +6339,13 @@ class WaitrepoTask(BaseTaskHandler):
         last_repo = None
 
         while True:
-            taginfo = self.session.getTag(tag, strict=True)
+            try:
+                taginfo = self.session.getTag(tag, strict=True)
+            except koji.GenericError:
+                self.logger.debug("Tag %s got lost while waiting for newrepo", tag)
+                raise koji.GenericError("Unsuccessfully waited %s for %s repo. "
+                                        "Tag was probably deleted meanwhile." %
+                                        (koji.util.duration(start), tag))
             repo = self.session.getRepo(taginfo['id'])
             if repo and repo != last_repo:
                 if builds: