From 201469e2c2b8afdc95379320056310f055b17d39 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Fri, 21 Mar 2025 14:26:01 -0700 Subject: [PATCH] Add "key import" action to NEWS (#345). --- NEWS | 1 + borgmatic/borg/import_key.py | 1 - borgmatic/commands/borgmatic.py | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index f7d06b2c..89d90393 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,5 @@ 2.0.0.dev0 + * #345: Add a "key import" action to import a repository key from backup. * #790, #821: Deprecate all "before_*", "after_*" and "on_error" command hooks in favor of more flexible "commands:". See the documentation for more information: https://torsion.org/borgmatic/docs/how-to/add-preparation-and-cleanup-steps-to-backups/ diff --git a/borgmatic/borg/import_key.py b/borgmatic/borg/import_key.py index 7f011ebc..9e902778 100644 --- a/borgmatic/borg/import_key.py +++ b/borgmatic/borg/import_key.py @@ -27,7 +27,6 @@ def import_key( Raise ValueError if the path is given and it does not exist. ''' - borgmatic.logger.add_custom_log_levels() umask = config.get('umask', None) lock_wait = config.get('lock_wait', None) working_directory = borgmatic.config.paths.get_working_directory(config) diff --git a/borgmatic/commands/borgmatic.py b/borgmatic/commands/borgmatic.py index 9c450936..bd1ec1e6 100644 --- a/borgmatic/commands/borgmatic.py +++ b/borgmatic/commands/borgmatic.py @@ -20,8 +20,8 @@ import borgmatic.actions.create import borgmatic.actions.delete import borgmatic.actions.export_key import borgmatic.actions.export_tar -import borgmatic.actions.import_key import borgmatic.actions.extract +import borgmatic.actions.import_key import borgmatic.actions.info import borgmatic.actions.list import borgmatic.actions.mount