[PR #7853/4e1a457d backport][3.105] Fix RepositoryVersion.remove_content using wrong queryset for lazy co…

CHANGES/7851.bugfix

@@ -0,0 +1 @@
+Fixed `RepositoryVersion.remove_content` failing when the queryset is derived from `self.content` and the repository version contains >= 65,535 content items. The lazy queryset was re-evaluated after `content_ids` was already updated, causing `RepositoryContent` entries to be left orphaned.

pulpcore/app/models/repository.py

@@ -1147,10 +1147,6 @@ def remove_content(self, content):
         content_ids = set(self._get_content_ids())
         to_remove = set(content.values_list("pk", flat=True))
         with transaction.atomic():
-            if to_remove:
-                self.content_ids = list(content_ids - to_remove)
-                self.save()
-
             # Normalize representation if content has already been added in this version.
             # Undo addition by deleting the RepositoryContent.
             RepositoryContent.objects.filter(
@@ -1165,6 +1161,10 @@ def remove_content(self, content):
             )
             q_set.update(version_removed=self)
 
+            if to_remove:
+                self.content_ids = list(content_ids - to_remove)
+                self.save()
+
     def set_content(self, content):
         """
         Sets the repo version content by calling remove_content() then add_content().