upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-12 18:30:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[FEATURE] Delete option to keep security info

Browse source 
When deleting a repository there is now an option --keep-security-info to leave the security info untouched.
It can be used afterwards with an older copy of the repo but current nonce to not breach security.
This commit is contained in:
Thalian 2020-03-26 07:18:07 +01:00
parent df67b9ea11
commit 92b577e46f
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/borg/archiver.py
View file

@ -1183,6 +1183,7 @@ class Archiver:
def _delete_repository(self, args, repository):
"""Delete a repository"""
dry_run = args.dry_run
keep_security_info = args.keep_security_info
if not args.cache_only:
msg = []
@ -1207,9 +1208,14 @@ class Archiver:
if not dry_run:
repository.destroy()
logger.info("Repository deleted.")
SecurityManager.destroy(repository)
if not keep_security_info:
SecurityManager.destroy(repository)
else:
logger.info("Would delete repository.")
if keep_security_info:
logger.info("Would keep security info.")
else:
logger.info("Would delete security info.")
if not dry_run:
Cache.destroy(repository)
logger.info("Cache deleted.")
@ -3352,9 +3358,10 @@ class Archiver:
Important: When deleting archives, repository disk space is **not** freed until
you run ``borg compact``.
If you delete the complete repository, the local cache for it (if any) is
also deleted. Alternatively, you can delete just the local cache with the
``--cache-only`` option.
When you delete a complete repository, the security info and local cache for it
(if any) is also deleted. Alternatively, you can delete just the local cache
with the ``--cache-only`` option, or keep the security info with the
``--keep-security-info`` option.
When using ``--stats``, you will get some statistics about how much data was
deleted - the "Deleted data" deduplicated size there is most interesting as
@ -3383,10 +3390,11 @@ class Archiver:
help='print statistics for the deleted archive')
subparser.add_argument('--cache-only', dest='cache_only', action='store_true',
help='delete only the local cache for the given repository')
subparser.add_argument('--force', dest='forced',
action='count', default=0,
subparser.add_argument('--force', dest='forced', action='count', default=0,
help='force deletion of corrupted archives, '
'use ``--force --force`` in case ``--force`` does not work.')
subparser.add_argument('--keep-security-info', dest='keep_security_info', action='store_true',
help='keep the local security info when deleting a repository')
subparser.add_argument('--save-space', dest='save_space', action='store_true',
help='work slower, but using less space')
subparser.add_argument('location', metavar='REPOSITORY_OR_ARCHIVE', nargs='?', default='',