|
@@ -1564,8 +1564,10 @@ class Archiver:
|
|
# 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)
|
|
archives_deleted = 0
|
|
archives_deleted = 0
|
|
|
|
+ pi = ProgressIndicatorPercent(total=len(to_delete), msg='Pruning archives %3.0f%%', msgid='prune')
|
|
for archive in archives_checkpoints:
|
|
for archive in archives_checkpoints:
|
|
if archive in to_delete:
|
|
if archive in to_delete:
|
|
|
|
+ pi.show()
|
|
if args.dry_run:
|
|
if args.dry_run:
|
|
if args.output_list:
|
|
if args.output_list:
|
|
list_logger.info('Would prune: %s' % format_archive(archive))
|
|
list_logger.info('Would prune: %s' % format_archive(archive))
|
|
@@ -1574,11 +1576,11 @@ class Archiver:
|
|
archives_deleted += 1
|
|
archives_deleted += 1
|
|
list_logger.info('Pruning archive: %s (%d/%d)' % (format_archive(archive),
|
|
list_logger.info('Pruning archive: %s (%d/%d)' % (format_archive(archive),
|
|
archives_deleted, to_delete_len))
|
|
archives_deleted, to_delete_len))
|
|
- Archive(repository, key, manifest, archive.name, cache,
|
|
|
|
- progress=args.progress).delete(stats, forced=args.forced)
|
|
|
|
|
|
+ Archive(repository, key, manifest, archive.name, cache).delete(stats, forced=args.forced)
|
|
else:
|
|
else:
|
|
if args.output_list:
|
|
if args.output_list:
|
|
list_logger.info('Keeping archive: %s' % format_archive(archive))
|
|
list_logger.info('Keeping archive: %s' % format_archive(archive))
|
|
|
|
+ pi.finish()
|
|
if to_delete and not args.dry_run:
|
|
if to_delete and not args.dry_run:
|
|
manifest.write()
|
|
manifest.write()
|
|
repository.commit(save_space=args.save_space)
|
|
repository.commit(save_space=args.save_space)
|