Avoid listing org packages where repo token doesn't have access

Author: mering

clean_ghcr.py

@@ -36,6 +36,8 @@ def get_req(path, params=None):
         params = {}
     response = requests.get(get_url(path), headers=get_base_headers(), params=params)
     if not response.ok:
+        if response.status_code == 404:
+            return None
         raise Exception(response.text)
     return response.json()
 
@@ -49,7 +51,9 @@ def get_list_req(path, params=None):
     another_page = True
     result = []
     while another_page:
-        result.extend(get_req(path, params=params))
+        response = get_req(path, params=params)
+        if response is not None:
+            result.extend(response)
         if "next" in response.links:
             url = response.links["next"]["url"]
             if "page" in params:
@@ -60,17 +64,20 @@ def get_list_req(path, params=None):
 
 
 def get_list_packages(owner, repo_name, owner_type, package_name):
-    all_org_pkg = get_list_req(
+    if package_name:
+        response = get_req(f"/{owner_type}s/{owner}/packages/container/{package_name}")
+        result = []
+        if response is not None:
+            result.extend(response)
+        return result
+
+    all_org_pkg = get_req(
         f"/{owner_type}s/{owner}/packages?package_type=container")
     if repo_name:
         all_org_pkg = [
             pkg for pkg in all_org_pkg if pkg.get("repository")
             and pkg["repository"]["name"].lower() == repo_name
         ]
-    if package_name:
-        all_org_pkg = [
-            pkg for pkg in all_org_pkg if pkg["name"] == package_name
-        ]
     return all_org_pkg