Stop overwriting new refs with old ones when copying them

closes #288
pulp · Sep 18, 2023 · 6d72ffb · 6d72ffb
1 parent 37fb7ee
commit 6d72ffb
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGES/288.bugfix b/CHANGES/288.bugfix
@@ -0,0 +1 @@
+Fixed the procedure of regenerating summaries by using the relevant refs only.
diff --git a/pulp_ostree/app/tasks/importing.py b/pulp_ostree/app/tasks/importing.py
@@ -353,9 +353,13 @@ async def run(self):
             await self.submit_ref_objects()
 
             latest_version = await self.repository.alatest_version()
-            refs = await sync_to_async(latest_version.get_content)(OstreeRef.objects)
+
+            # consider and copy already uploaded refs to correctly regenerate the summary; skip
+            # refs there were just added to the repository as new content
+            refs = await sync_to_async(latest_version.get_content(OstreeRef.objects).exclude)(
+                name__in=(dc.content.name for dc in self.refs_dcs)
+            )
             async for ref in refs:
-                # consider already uploaded refs to correctly regenerate the summary
                 file_path = os.path.join(self.repo_path, "refs", "heads", ref.name)
                 ref_file = await ref._artifacts.aget()
                 copy_to_local_storage(ref_file.file, file_path)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed the procedure of regenerating summaries by using the relevant refs only.