Просмотр исходного кода

Add "key import" action to NEWS (#345).

Dan Helfman 2 месяцев назад
Родитель
Сommit
201469e2c2
3 измененных файлов с 2 добавлено и 2 удалено
  1. 1 0
      NEWS
  2. 0 1
      borgmatic/borg/import_key.py
  3. 1 1
      borgmatic/commands/borgmatic.py

+ 1 - 0
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/

+ 0 - 1
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)

+ 1 - 1
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