Fix DEBUG logging of duplicate pakcages

closes #994
pulp · Feb 27, 2024 · 15c24cf · 15c24cf
1 parent c3680f2
commit 15c24cf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGES/994.bugfix b/CHANGES/994.bugfix
@@ -0,0 +1 @@
+Fixed DEBUG logging of prohibited duplicate packages.
diff --git a/pulp_deb/app/models/repository.py b/pulp_deb/app/models/repository.py
@@ -154,13 +154,14 @@ def handle_duplicate_packages(new_version):
         added_checksum_unique = package_qs_added.distinct(*repo_key_fields, "sha256")
 
         if added_unique.count() < added_checksum_unique.count():
-            package_qs_added_duplicates = added_checksum_unique.difference(added_unique)
             if log.isEnabledFor(logging.DEBUG):
                 message = _(
-                    "New repository version contains multiple packages with '{}', but differing "
+                    'New repository version contains multiple packages with "{}", but differing '
                     "checksum!"
                 )
-                for package_fields in package_qs_added_duplicates.values(*repo_key_fields):
+                package_qs_added_dups = added_checksum_unique.difference(added_unique)
+                for package_fields in package_qs_added_dups.values(*repo_key_fields, "sha256"):
+                    package_fields.pop("sha256")
                     log.debug(message.format(package_fields))
 
             message = _(
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed DEBUG logging of prohibited duplicate packages.