scripts/orphaned-packages-process/find_unblocked_orphans.py

@@ -500,9 +500,7 @@ class DepChecker:
                             ).setdefault(pkg, set()).add(dep)
                     for new_srpm_name in new_srpm_names:
                         self.dep_chain[new_srpm_name].add(check_next)
-
-                    for srpm_name in new_srpm_names:
-                        self.pagureinfo_queue.put(srpm_name)
+                        self.pagureinfo_queue.put(new_srpm_name)
 
                     ignore.extend(new_names)
                     if allow_more:
@@ -846,26 +844,26 @@ def main():
     if args.repo is not None:
         RELEASES[args.release]["repo"] = args.repo
 
+    text = "Report started at %s\n\n" % (
+        datetime.datetime.now(datetime.timezone.utc).strftime("%Y-%m-%d %H:%M:%S UTC")
+    )
+
     if args.skip_orphans:
         orphans = []
+        unblocked = failed
     else:
         # list of orphans from pagure
         eprint("Contacting pagure for list of orphans...", end=" ")
         orphans = sorted(orphan_packages())
         eprint("done")
+        allpkgs = sorted(list(set(list(orphans) + failed)))
 
-    text = "Report started at %s\n\n" % (
-        datetime.datetime.now(datetime.timezone.utc).strftime("%Y-%m-%d %H:%M:%S UTC")
-    )
-    eprint("Getting builds from koji...", end=" ")
-    allpkgs = sorted(list(set(list(orphans) + failed)))
-    if args.skipblocked:
-        koji_tag = RELEASES[args.release]["koji_tag"]
-        koji_hub = RELEASES[args.release]["koji_hub"]
-        unblocked = unblocked_packages(allpkgs, tagID=koji_tag, kojihub=koji_hub)
-    else:
-        unblocked = allpkgs
-    eprint("done")
+        if args.skipblocked:
+            eprint("Getting builds from koji...", end=" ")
+            koji_tag = RELEASES[args.release]["koji_tag"]
+            koji_hub = RELEASES[args.release]["koji_hub"]
+            unblocked = unblocked_packages(allpkgs, tagID=koji_tag, kojihub=koji_hub)
+            eprint("done")
 
     text += HEADER.format(RELEASES[args.release]["koji_tag"].upper())
     eprint("Setting up dependency checker...", end=" ")
@@ -916,7 +914,7 @@ def main():
             eprint(f"{type(e).__name__}: e")
 
     if args.mailto or args.send:
-        now = datetime.datetime.utcnow()
+        now = datetime.datetime.now(datetime.timezone.utc)
         today = now.strftime("%Y-%m-%d")
         subject = f"Orphaned Packages in {args.release} ({today})"
         if args.mailto: