From f58e6ad92bbfdc81db56f16dab72cbbcb1622da8 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Tue, 25 Apr 2023 09:54:53 -0400
Subject: [PATCH] bugfixes and additional debug logging

---
 util/kojira | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/util/kojira b/util/kojira
index ce06d6c3..4c5f7dc4 100755
--- a/util/kojira
+++ b/util/kojira
@@ -803,18 +803,26 @@ class RepoManager(object):
 
     def updateTagScores(self):
         # call listTasks waitrepo
-        awaited = self.session.listTasks(opts={'method': ['waitrepo'],
-                                               'state': [koji.TASK_STATES['FREE'],
-                                                         koji.TASK_STATES['ASSIGNED'],
-                                                         koji.TASK_STATES['OPEN']]})
+        tasks = self.session.listTasks(opts={'method': ['waitrepo'],
+                                             'decode': True,
+                                             'state': [koji.TASK_STATES['FREE'],
+                                                       koji.TASK_STATES['ASSIGNED'],
+                                                       koji.TASK_STATES['OPEN']]})
         awaited = set()
-        for task in awaited:
+        if tasks:
+            logger.debug("Checking %s active waitrepo tasks", len(tasks))
+        for task in tasks:
             try:
-                awaited.add(koji.parse_task_params('waitrepo', task['request'])['tag'])
+                tag_param = koji.parse_task_params('waitrepo', task['request'])['tag']
+                taginfo = getTag(self.session, tag_param)
             except Exception:
                 # ignore malformed tasks
                 self.logger.debug(f"Malformed task: {task}")
-                pass
+                continue
+            if taginfo:
+                awaited.add(taginfo['id'])
+            else:
+                self.logger.debug("Found waitrepo task %i with bad tag arg: %r", task['id'], tag_param)
 
         for tag_id, entry in self.needed_tags.items():
             if tag_id in awaited: