mirror of
https://github.com/mofeng-git/One-KVM.git
synced 2026-01-29 00:51:53 +08:00
options overwrites override
This commit is contained in:
@@ -123,8 +123,8 @@ def _init_config(
|
|||||||
|
|
||||||
scheme = _get_config_scheme()
|
scheme = _get_config_scheme()
|
||||||
try:
|
try:
|
||||||
_merge_dicts(raw_config, build_raw_from_options(override_options))
|
|
||||||
_merge_dicts(raw_config, (raw_config.pop("override", {}) or {}))
|
_merge_dicts(raw_config, (raw_config.pop("override", {}) or {}))
|
||||||
|
_merge_dicts(raw_config, build_raw_from_options(override_options))
|
||||||
config = make_config(raw_config, scheme)
|
config = make_config(raw_config, scheme)
|
||||||
|
|
||||||
rebuild = False
|
rebuild = False
|
||||||
|
|||||||
Reference in New Issue
Block a user