Taught prune() to call remove_content() with a Content queryset.

fixes #3778
pulp · Nov 7, 2024 · 34bb2f0 · 34bb2f0
1 parent 5d81100
commit 34bb2f0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CHANGES/3778.bugfix b/CHANGES/3778.bugfix
@@ -0,0 +1 @@
+Fix traceback from prune() call discovered after `pulp/pulpcore#5934` addressed.
diff --git a/pulp_rpm/app/tasks/prune.py b/pulp_rpm/app/tasks/prune.py
@@ -8,6 +8,7 @@
 from pulpcore.plugin.models import ProgressReport
 from pulpcore.plugin.constants import TASK_STATES
 from pulpcore.plugin.models import (
+    Content,
     GroupProgressReport,
     RepositoryContent,
     TaskGroup,
@@ -91,8 +92,9 @@ def prune_repo_packages(repo_pk, keep_days, dry_run):
             ):
                 log.debug(f'{p["name"]}-{p["epoch"]}:{p["version"]}-{p["release"]}.{p["arch"]}')
     else:
+        content_q = Content.objects.filter(pk__in=target_ids_q)
         with repo.new_version(base_version=None) as new_version:
-            new_version.remove_content(target_ids_q)
+            new_version.remove_content(content_q)
         data["done"] = to_be_removed
 
     pb = ProgressReport(**data)