Fix command-line "--override" flag to continue supporting old configuration file formats (#561).
This commit is contained in:
parent
6005426684
commit
c0f48e1071
2 changed files with 2 additions and 1 deletions
1
NEWS
1
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
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in a new issue