Explorar o código

Make warning about sections a little more explicit (#721).

Dan Helfman hai 1 ano
pai
achega
7313430178
Modificáronse 2 ficheiros con 5 adicións e 5 borrados
  1. 4 4
      NEWS
  2. 1 1
      borgmatic/config/normalize.py

+ 4 - 4
NEWS

@@ -38,10 +38,10 @@
    "check --repair".
  * When merging two configuration files, error gracefully if the two files do not adhere to the same
    format.
- * #721: Remove configuration sections ("location:", "storage:", "hooks:" etc.), while still keeping
-   deprecated support for them. Now, all options are at the same level, and you don't need to worry
-   about commenting/uncommenting section headers when you change an option (if you remove your
-   sections first).
+ * #721: Remove configuration sections ("location:", "storage:", "hooks:", etc.), while still
+   keeping deprecated support for them. Now, all options are at the same level, and you don't need
+   to worry about commenting/uncommenting section headers when you change an option (if you remove
+   your sections first).
  * #721: BREAKING: The retention prefix and the consistency prefix can no longer have different
    values (unless one is not set).
  * #721: BREAKING: The storage umask and the hooks umask can no longer have different values (unless

+ 1 - 1
borgmatic/config/normalize.py

@@ -50,7 +50,7 @@ def normalize_sections(config_filename, config):
                 dict(
                     levelno=logging.WARNING,
                     levelname='WARNING',
-                    msg=f'{config_filename}: Configuration sections (like location: and storage:) are deprecated and support will be removed from a future release. To prepare for this, move your options out of sections to the global scope.',
+                    msg=f'{config_filename}: Configuration sections (like location:, storage:, retention:, consistency:, and hooks:) are deprecated and support will be removed from a future release. To prepare for this, move your options out of sections to the global scope.',
                 )
             )
         ]