mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #6630 from ThomasWaldmann/fix-iec-master 

fix --iec mode output for borg delete and prune
This commit is contained in:
TW 2022-04-19 23:39:13 +02:00 committed by GitHub
parent f937a72a13 c86d19cc06
commit 12d27d7944
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/borg/archiver.py
View File

@ -1403,8 +1403,8 @@ class Archiver:
logger.warning('Aborted.') logger.warning('Aborted.')
return self.exit_code return self.exit_code
stats = Statistics() stats = Statistics(iec=args.iec)
with Cache(repository, key, manifest, progress=args.progress, lock_wait=self.lock_wait) as cache: with Cache(repository, key, manifest, progress=args.progress, lock_wait=self.lock_wait, iec=args.iec) as cache:
msg_delete = 'Would delete archive: {} ({}/{})' if dry_run else 'Deleting archive: {} ({}/{})' msg_delete = 'Would delete archive: {} ({}/{})' if dry_run else 'Deleting archive: {} ({}/{})'
msg_not_found = 'Archive {} not found ({}/{}).' msg_not_found = 'Archive {} not found ({}/{}).'
logger_list = logging.getLogger('borg.output.list') logger_list = logging.getLogger('borg.output.list')
@ -1727,8 +1727,8 @@ class Archiver:
keep += prune_split(archives, rule, num, kept_because) keep += prune_split(archives, rule, num, kept_because)
to_delete = (set(archives) | checkpoints) - (set(keep) | set(keep_checkpoints)) to_delete = (set(archives) | checkpoints) - (set(keep) | set(keep_checkpoints))
stats = Statistics() stats = Statistics(iec=args.iec)
with Cache(repository, key, manifest, lock_wait=self.lock_wait) as cache: with Cache(repository, key, manifest, lock_wait=self.lock_wait, iec=args.iec) as cache:
list_logger = logging.getLogger('borg.output.list') list_logger = logging.getLogger('borg.output.list')
# set up counters for the progress display # set up counters for the progress display
to_delete_len = len(to_delete) to_delete_len = len(to_delete)