From 95976f4cf4cfb49aae723056138ecaa10241944b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Ma=CC=88der?= Date: Tue, 23 Feb 2021 22:50:16 +0100 Subject: [PATCH] Don't load main config twice Before, the main_config (e.g. 'configuration.py' or 'ldap_config.py') were loaded twice. The first load was hard-coded and correct. The second load was during the discovery phase for dynamic configurations. This has now been fixed. During the discovery for dynamic configurations, the main_config file is now excluded. Thanks @tobiasge for discovering this bug. --- docker/configuration.docker.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker/configuration.docker.py b/docker/configuration.docker.py index 3cd5f7b..f5b15e0 100644 --- a/docker/configuration.docker.py +++ b/docker/configuration.docker.py @@ -45,6 +45,9 @@ def read_configurations(config_module, config_dir, main_config): if not f.name.endswith(".py"): continue + if f.name == f"{main_config}.py": + continue + if f.name == f"{config_dir}.py": continue