upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-05-28 04:03:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #6202 from ThomasWaldmann/fix-del-nonexist-1.1

Browse source 
delete: don't commit if nothing was deleted, avoid cache sync, fixes #6060
This commit is contained in:
TW 2022-01-30 19:50:55 +01:00 committed by GitHub
commit 495b82e45b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/borg/archiver.py
View file

@ -1352,6 +1352,7 @@ class Archiver:
with Cache(repository, key, manifest, progress=args.progress, lock_wait=self.lock_wait) as cache:
msg_delete = 'Would delete archive: {} ({}/{})' if dry_run else 'Deleting archive: {} ({}/{})'
msg_not_found = 'Archive {} not found ({}/{}).'
delete_count = 0
for i, archive_name in enumerate(archive_names, 1):
try:
archive_info = manifest.archives[archive_name]
@ -1363,7 +1364,9 @@ class Archiver:
archive = Archive(repository, key, manifest, archive_name, cache=cache,
consider_part_files=args.consider_part_files)
archive.delete(stats, progress=args.progress, forced=args.forced)
if not dry_run:
delete_count += 1
if delete_count > 0:
# only write/commit if we actually changed something, see #6060.
manifest.write()
repository.commit(save_space=args.save_space)
cache.commit()