Allow YAML config file to contain None (#7779)

Useful when config file is fully commented Signed-off-by: Alex Kotov <kotovalexarian@gmail.com>
2020-07-03 17:19:03 +05:00 · 2020-07-03 17:19:03 +05:00 · 8097659f6e
parent f3e0f16240
commit 8097659f6e
2 changed files with 3 additions and 1 deletions
--- a/changelog.d/7779.bugfix
+++ b/changelog.d/7779.bugfix
@ -0,0 +1 @@
+Fix synctl to handle empty config files correctly. Contributed by @kotovalexarian.
--- a/3
+++ b/3
@ -239,7 +239,8 @@ def main():
    for config_file in config_files:
        with open(config_file) as file_stream:
            yaml_config = yaml.safe_load(file_stream)
-        config.update(yaml_config)
+        if yaml_config is not None:
+            config.update(yaml_config)

    pidfile = config["pid_file"]
    cache_factor = config.get("synctl_cache_factor")
				`@ -0,0 +1 @@`
				`Fix synctl to handle empty config files correctly. Contributed by @kotovalexarian.`