From 15c24cf17aad042082d5bab2348f25420dd9c874 Mon Sep 17 00:00:00 2001 From: Quirin Pamp Date: Tue, 27 Feb 2024 10:48:48 +0100 Subject: [PATCH] Fix DEBUG logging of duplicate pakcages closes #994 --- CHANGES/994.bugfix | 1 + pulp_deb/app/models/repository.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 CHANGES/994.bugfix diff --git a/CHANGES/994.bugfix b/CHANGES/994.bugfix new file mode 100644 index 000000000..ca062bb4e --- /dev/null +++ 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 index fa2ed458f..1fe1b78bc 100644 --- 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 = _(