From 1617c504047330d2194471209568a0d9366541ff Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Jul 05 2024 18:14:20 +0000
Subject: fix rebase issue and missing return values


---

diff --git a/builder/kojid b/builder/kojid
index 06fc015..f1e96d1 100755
--- a/builder/kojid
+++ b/builder/kojid
@@ -5830,12 +5830,7 @@ class NewRepoTask(BaseTaskHandler):
             return None, None
 
         # see if we can find a previous repo to update from
-        # only shadowbuild tags should start with SHADOWBUILD, their repos are auto
-        # expired.  so lets get the most recent expired tag for newRepo shadowbuild tasks.
-        if tinfo['name'].startswith('SHADOWBUILD'):
-            oldrepo_state = koji.REPO_EXPIRED
-        else:
-            oldrepo_state = koji.REPO_READY
+        oldrepo_state = koji.REPO_READY
         oldrepo = self.session.getRepo(tinfo['id'], state=oldrepo_state)
         oldrepo_path = None
         if oldrepo:
@@ -5869,7 +5864,10 @@ class NewRepoTask(BaseTaskHandler):
                 parenttag = self.session.getTag(link['parent_id'])
                 oldrepo_path = koji.pathinfo.repo(oldrepo['id'], parenttag['name'])
                 oldrepo['tag_id'] = parenttag['id']
-                break
+                return oldrepo, oldrepo_path
+
+        # otherwise no match
+        return None, None
 
     def handler(self, tag, event=None, src=None, debuginfo=None, separate_src=None, opts=None):
         tinfo = self.session.getTag(tag, strict=True, event=event)