From 731343017806597bb54ddc17582afd91b0e6706b Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Sat, 19 Aug 2023 22:51:20 -0700 Subject: [PATCH] Make warning about sections a little more explicit (#721). --- NEWS | 8 ++++---- borgmatic/config/normalize.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index bf901d8..e46fe85 100644 --- a/NEWS +++ b/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 diff --git a/borgmatic/config/normalize.py b/borgmatic/config/normalize.py index 7ff2a65..55baf9f 100644 --- a/borgmatic/config/normalize.py +++ b/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.', ) ) ]