From c0f48e1071e5c3ce4d3d43aba5b18f852657e4ef Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Wed, 6 Jul 2022 18:14:44 -0700 Subject: [PATCH] Fix command-line "--override" flag to continue supporting old configuration file formats (#561). --- NEWS | 1 + borgmatic/config/validate.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index ee2d900..cd805cf 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ 1.6.6.dev0 * #559: Update documentation about configuring multiple consistency checks or multiple databases. + * #561: Fix command-line "--override" flag to continue supporting old configuration file formats. 1.6.5 * #553: Fix logging to include the full traceback when Borg experiences an internal error, not just diff --git a/borgmatic/config/validate.py b/borgmatic/config/validate.py index 66746ba..a782d7b 100644 --- a/borgmatic/config/validate.py +++ b/borgmatic/config/validate.py @@ -98,8 +98,8 @@ def parse_configuration(config_filename, schema_filename, overrides=None, resolv except (ruamel.yaml.error.YAMLError, RecursionError) as error: raise Validation_error(config_filename, (str(error),)) - normalize.normalize(config) override.apply_overrides(config, overrides) + normalize.normalize(config) if resolve_env: environment.resolve_env_variables(config)