From 24de8514fa488885c314902942963ca3b6a8c930 Mon Sep 17 00:00:00 2001 From: Marian Beermann Date: Mon, 24 Jul 2017 10:33:03 +0200 Subject: [PATCH 1/2] with-lock: fix help text --- src/borg/archiver.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/borg/archiver.py b/src/borg/archiver.py index f0f327dd4..57c1231cb 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -3525,8 +3525,9 @@ class Archiver: .. note:: If you copy a repository with the lock held, the lock will be present in - the copy, obviously. Thus, before using borg on the copy, you need to - use "borg break-lock" on it. + the copy. Thus, before using borg on the copy from a different host, + you need to use "borg break-lock" on the copied repository, because + Borg is cautious and does not automatically remove stale locks made by a different host. """) subparser = subparsers.add_parser('with-lock', parents=[common_parser], add_help=False, description=self.do_with_lock.__doc__, From b4b58e7225cce2ebb6b4800eacda570d5f1d9d86 Mon Sep 17 00:00:00 2001 From: Marian Beermann Date: Mon, 24 Jul 2017 10:37:12 +0200 Subject: [PATCH 2/2] info: explain max. archive size --- src/borg/archiver.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/borg/archiver.py b/src/borg/archiver.py index 57c1231cb..bebe8749f 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -1415,7 +1415,7 @@ class Archiver: Duration: {duration} Number of files: {stats[nfiles]} Command line: {command_line} - Utilization of max. archive size: {limits[max_archive_size]:.0%} + Utilization of maximum supported archive size: {limits[max_archive_size]:.0%} ------------------------------------------------------------------------------ Original size Compressed size Deduplicated size This archive: {stats[original_size]:>20s} {stats[compressed_size]:>20s} {stats[deduplicated_size]:>20s} @@ -3211,9 +3211,14 @@ class Archiver: are meaning different things: This archive / deduplicated size = amount of data stored ONLY for this archive - = unique chunks of this archive. + = unique chunks of this archive. All archives / deduplicated size = amount of data stored in the repo - = all chunks in the repository. + = all chunks in the repository. + + Borg archives can only contain a limited amount of file metadata. + The size of an archive relative to this limit depends on a number of factors, + mainly the number of files, the lengths of paths and other metadata stored for files. + This is shown as *utilization of maximum supported archive size*. """) subparser = subparsers.add_parser('info', parents=[common_parser], add_help=False, description=self.do_info.__doc__,