Fix cross-domain content assertion

(cherry picked from commit c1d6081)
pulp · Nov 11, 2024 · 429bc4d · 429bc4d
1 parent fc7ac75
commit 429bc4d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CHANGES/content-assert.bugfix b/CHANGES/content-assert.bugfix
@@ -0,0 +1 @@
+Fixed an assertion on all content being added/removed in a repository version is of the same domain.
diff --git a/pulpcore/app/models/repository.py b/pulpcore/app/models/repository.py
@@ -945,7 +945,11 @@ def add_content(self, content):
         if self.complete:
             raise ResourceImmutableError(self)
 
-        assert not content.exclude(pulp_domain_id=get_domain_pk()).exists()
+        assert (
+            not Content.objects.filter(pk__in=content)
+            .exclude(pulp_domain_id=get_domain_pk())
+            .exists()
+        )
         repo_content = []
         to_add = set(content.values_list("pk", flat=True)) - set(
             self.content.values_list("pk", flat=True)
@@ -987,7 +991,11 @@ def remove_content(self, content):
 
         if not content or not content.count():
             return
-        assert not content.exclude(pulp_domain_id=get_domain_pk()).exists()
+        assert (
+            not Content.objects.filter(pk__in=content)
+            .exclude(pulp_domain_id=get_domain_pk())
+            .exists()
+        )
 
         # Normalize representation if content has already been added in this version.
         # Undo addition by deleting the RepositoryContent.