From fee1dff8d052afde16dc64b83eba506d639e79ee Mon Sep 17 00:00:00 2001 From: mprahl Date: Tue, 17 Mar 2020 17:08:27 -0400 Subject: [PATCH] Honor the MBS_CONFIG_SECTION environment variable when performing a local build --- module_build_service/common/config.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/module_build_service/common/config.py b/module_build_service/common/config.py index 1207a571..3255f1b3 100644 --- a/module_build_service/common/config.py +++ b/module_build_service/common/config.py @@ -109,7 +109,7 @@ def init_config(): :rtype: tuple(Config, object) """ config_file = os.environ.get("MBS_CONFIG_FILE", "/etc/module-build-service/config.py") - config_section = os.environ.get("MBS_CONFIG_SECTION", "ProdConfiguration") + try: config_module = imp.load_source("mbs_runtime_config", config_file) log.info("Using the configuration file at %s", config_file) @@ -132,7 +132,10 @@ def init_config(): config_section = "OfflineLocalBuildConfiguration" else: config_section = "LocalBuildConfiguration" + else: + config_section = "ProdConfiguration" + config_section = os.environ.get("MBS_CONFIG_SECTION", config_section) if hasattr(config_module, config_section): log.info("Using the configuration section %s", config_section) config_section_obj = getattr(config_module, config_section)