Browse Source

Fix for an incorrect diff command shown when running the "generate config" action with a source configuration file (#1194).

Dan Helfman 4 days ago
parent
commit
7dc902f5db
3 changed files with 7 additions and 3 deletions
  1. 4 0
      NEWS
  2. 2 2
      borgmatic/actions/config/generate.py
  3. 1 1
      pyproject.toml

+ 4 - 0
NEWS

@@ -1,3 +1,7 @@
+2.0.13.dev0
+ * #1194: Fix for an incorrect diff command shown when running the "generate config" action with a
+   source configuration file. 
+
 2.0.12
  * #1127: Fix for the database hooks not respecting the "working_directory" option.
  * #1181: Add an "ask_for_password" option to the KeePassXC credential hook for disabling

+ 2 - 2
borgmatic/actions/config/generate.py

@@ -36,12 +36,12 @@ def run_generate(generate_arguments, global_arguments):
     if generate_arguments.source_filename:
         logger.answer(
             f'''
-Merged in the contents of configuration file at: {generate_arguments.source_filename}'''
+Merged the contents of the source configuration file: {generate_arguments.source_filename}'''
         )
 
         if not generate_arguments.split:
             logger.answer(
-                '''To review the changes made, run:
+                f'''To review the changes made, run:
 
     diff --unified {generate_arguments.source_filename} {generate_arguments.destination_path}''',
             )

+ 1 - 1
pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "borgmatic"
-version = "2.0.12"
+version = "2.0.13.dev0"
 authors = [
   { name="Dan Helfman", email="witten@torsion.org" },
 ]