upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-09 08:51:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

delete: compute archive_formatted before archive deletion, see #9416

Browse source 
here it was not a problem currently, because format_archive(archive_info) does not load the archive from the repo, but only uses the given archive_info contents.
This commit is contained in:
Thomas Waldmann 2026-03-01 06:08:14 +01:00
parent 3c204c31f3
commit 8a4f42d0d2
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/borg/archiver/delete_cmd.py
View file

@ -36,6 +36,8 @@ class DeleteMixIn:
logger_list = logging.getLogger("borg.output.list")
for i, archive_info in enumerate(archive_infos, 1):
name, id, hex_id = archive_info.name, archive_info.id, bin_to_hex(archive_info.id)
# format early before deletion of the archive
archive_formatted = format_archive(archive_info)
try:
# this does NOT use Archive.delete, so this code hopefully even works in cases a corrupt archive
# would make the code in class Archive crash, so the user can at least get rid of such archives.
@ -47,7 +49,7 @@ class DeleteMixIn:
deleted = True
if self.output_list:
msg = "Would delete: {} ({}/{})" if dry_run else "Deleted archive: {} ({}/{})"
logger_list.info(msg.format(format_archive(archive_info), i, count))
logger_list.info(msg.format(archive_formatted, i, count))
if dry_run:
logger.info("Finished dry-run.")
elif deleted: