From 8d1ae6f0f7a16ecac4356370dd3d2741c29eb63b Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 27 Sep 2020 23:46:45 +0200 Subject: [PATCH 1/2] Revert "add double force" This reverts commit 6fac203d86d6df5f803a8d93db6bc07b86d66eeb. Fix was applied to an autogenerated file, it needs to be applied to the builtin help of the borg code. --- docs/usage/prune.rst.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/usage/prune.rst.inc b/docs/usage/prune.rst.inc index 7ca4cc663..dd82bf0ef 100644 --- a/docs/usage/prune.rst.inc +++ b/docs/usage/prune.rst.inc @@ -21,7 +21,7 @@ borg prune +-----------------------------------------------------------------------------+---------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------+ | | ``-n``, ``--dry-run`` | do not change repository | +-----------------------------------------------------------------------------+---------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------+ - | | ``--force`` | force pruning of corrupted archives, use ``--force --force`` in case ``--force`` does not work. | + | | ``--force`` | force pruning of corrupted archives | +-----------------------------------------------------------------------------+---------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------+ | | ``-s``, ``--stats`` | print statistics for the deleted archive | +-----------------------------------------------------------------------------+---------------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------+ From 90aef3bfccea78d93308e400914136041e79914c Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sun, 27 Sep 2020 23:51:23 +0200 Subject: [PATCH 2/2] docs: mention double --force in prune docs --- src/borg/archiver.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/borg/archiver.py b/src/borg/archiver.py index 9779d81ad..efb5d96d7 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -4063,7 +4063,8 @@ def define_borg_mount(parser): subparser.add_argument('-n', '--dry-run', dest='dry_run', action='store_true', help='do not change repository') subparser.add_argument('--force', dest='forced', action='store_true', - help='force pruning of corrupted archives') + help='force pruning of corrupted archives, ' + 'use ``--force --force`` in case ``--force`` does not work.') subparser.add_argument('-s', '--stats', dest='stats', action='store_true', help='print statistics for the deleted archive') subparser.add_argument('--list', dest='output_list', action='store_true',