浏览代码

Fix command-line "--override" flag to continue supporting old configuration file formats (#561).

Dan Helfman 2 年之前
父节点
当前提交
c0f48e1071
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 0
      NEWS
  2. 1 1
      borgmatic/config/validate.py

+ 1 - 0
NEWS

@@ -1,5 +1,6 @@
 1.6.6.dev0
 1.6.6.dev0
  * #559: Update documentation about configuring multiple consistency checks or multiple databases.
  * #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
 1.6.5
  * #553: Fix logging to include the full traceback when Borg experiences an internal error, not just
  * #553: Fix logging to include the full traceback when Borg experiences an internal error, not just

+ 1 - 1
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:
     except (ruamel.yaml.error.YAMLError, RecursionError) as error:
         raise Validation_error(config_filename, (str(error),))
         raise Validation_error(config_filename, (str(error),))
 
 
-    normalize.normalize(config)
     override.apply_overrides(config, overrides)
     override.apply_overrides(config, overrides)
+    normalize.normalize(config)
     if resolve_env:
     if resolve_env:
         environment.resolve_env_variables(config)
         environment.resolve_env_variables(config)