Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGES/1352.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improved repair_metadata task logging to show repository and package names instead of UUIDs.
29 changes: 20 additions & 9 deletions pulp_python/app/tasks/repair.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,18 +50,29 @@ def repair(repository_pk: UUID) -> None:
num_repaired, pkgs_not_repaired, num_metadata_repaired, pkgs_metadata_not_repaired = (
repair_metadata(content)
)
# Convert set() to 0
if not pkgs_not_repaired:
pkgs_not_repaired = 0
if not pkgs_metadata_not_repaired:
pkgs_metadata_not_repaired = 0

def _format_pkg_set(pk_set):
"""Resolve a set of package PKs to 'name-version (pk)' strings."""
if not pk_set:
return "none"
packages = PythonPackageContent.objects.filter(pk__in=pk_set).values_list(
"name", "version", "pk"
)
return ", ".join(f"{name}-{version} ({pk})" for name, version, pk in packages)

log.info(
_(
"{} packages' metadata repaired. Not repaired packages due to either "
"inaccessible URL or mismatched sha256: {}. "
"{} metadata files repaired. Packages whose metadata files could not be repaired: {}."
).format(num_repaired, pkgs_not_repaired, num_metadata_repaired, pkgs_metadata_not_repaired)
"Repository: %s. "
"%d packages' metadata repaired. "
"Not repaired packages due to either inaccessible URL or mismatched sha256: [%s]. "
"%d metadata files repaired. "
"Packages whose metadata files could not be repaired: [%s]."
),
repository.name,
num_repaired,
_format_pkg_set(pkgs_not_repaired),
num_metadata_repaired,
_format_pkg_set(pkgs_metadata_not_repaired),
)


Expand Down
Loading