From d9dda20c34e15663238fde5005fa3a7814405936 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Nov 30 2023 20:19:51 +0000
Subject: same fix for other scripts


---

diff --git a/src/bin/koji-check-builds b/src/bin/koji-check-builds
index 80b81a7..899246a 100755
--- a/src/bin/koji-check-builds
+++ b/src/bin/koji-check-builds
@@ -251,6 +251,7 @@ def feeder_main(opts, args):
     '''Fetch builds and feed them into the queu'''
     global session
     session = new_session()
+    i = 0
     for i, build in enumerate(get_builds(opts, args), start=1):
         while queue.qsize() > 1000:
             # avoid overloading the queue
@@ -348,21 +349,21 @@ def get_tagged_builds(options, args):
     if options.type is not None:
         opts['type'] = options.type
     if options.package:
+        # our call requires a name, but the script will also accept an id
+        package = options.package
         try:
-            opts['packageID'] = int(options.package)
+            package = int(package)
         except ValueError:
-            package = session.getPackageID(options.package)
-            if package is None:
-                raise ValueError('invalid package option')
-            opts['package'] = package
+            pass
+        opts['package'] = session.getPackage(package, strict=True)['name']
     if options.owner:
+        # our call requires a name, but the script will also accept an id
+        owner = options.owner
         try:
-            opts['userID'] = int(options.owner)
+            owner = int(owner)
         except ValueError:
-            user = session.getUser(options.owner)
-            if user is None:
-                raise ValueError("Invalid owner option")
-            opts['owner'] = user['id']
+            pass
+        opts['owner'] = session.getUser(owner, strict=True)['name']
     if options.volume:
         raise ValueError('The --volume option is incompatible with --tag')
     for opt in ('before', 'after'):
diff --git a/src/bin/koji-fix-build-symlink b/src/bin/koji-fix-build-symlink
index 84e0f35..635f24d 100755
--- a/src/bin/koji-fix-build-symlink
+++ b/src/bin/koji-fix-build-symlink
@@ -260,6 +260,7 @@ def feeder_main(opts, args):
     global session
     session = get_session()
 
+    i = 0
     for i, build in enumerate(get_builds(opts, args), start=1):
         while build_queue.qsize() > 1000:
             # avoid overloading the queue
@@ -366,21 +367,21 @@ def get_tagged_builds(options, args):
     if options.type is not None:
         opts['type'] = options.type
     if options.package:
+        # our call requires a name, but the script will also accept an id
+        package = options.package
         try:
-            opts['packageID'] = int(options.package)
+            package = int(package)
         except ValueError:
-            package = session.getPackageID(options.package)
-            if package is None:
-                raise ValueError('invalid package option')
-            opts['package'] = package
+            pass
+        opts['package'] = session.getPackage(package, strict=True)['name']
     if options.owner:
+        # our call requires a name, but the script will also accept an id
+        owner = options.owner
         try:
-            opts['userID'] = int(options.owner)
+            owner = int(owner)
         except ValueError:
-            user = session.getUser(options.owner)
-            if user is None:
-                raise ValueError("Invalid owner option")
-            opts['owner'] = user['id']
+            pass
+        opts['owner'] = session.getUser(owner, strict=True)['name']
     if options.volume:
         raise ValueError('The --volume option is incompatible with --tag')
     for opt in ('before', 'after'):