From f295d562e2e0cc44fc9670148f2bc37964f5a4b3 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Fri, 8 Mar 2024 13:04:49 -0500 Subject: [PATCH] Override python version _before_ parsing the configs and rendering template strings --- src/main.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main.c b/src/main.c index 9b2d7e4..ac17d8c 100644 --- a/src/main.c +++ b/src/main.c @@ -275,6 +275,14 @@ int main(int argc, char *argv[], char *arge[]) { memset(omc_sysconfdir_tmp, 0, sizeof(omc_sysconfdir_tmp)); } + // Override Python version from command-line, if any + if (strlen(python_override_version)) { + guard_free(ctx.meta.python) + ctx.meta.python = strdup(python_override_version); + guard_free(ctx.meta.python_compact); + ctx.meta.python_compact = to_short_version(ctx.meta.python); + } + if (config_input) { msg(OMC_MSG_L2, "Reading OMC global configuration: %s\n", config_input); cfg = ini_open(config_input); @@ -291,14 +299,6 @@ int main(int argc, char *argv[], char *arge[]) { exit(1); } - // Override Python version from command-line, if any - if (strlen(python_override_version)) { - guard_free(ctx.meta.python) - ctx.meta.python = strdup(python_override_version); - guard_free(ctx.meta.python_compact); - ctx.meta.python_compact = to_short_version(ctx.meta.python); - } - if (delivery_init(&ctx, ini, cfg)) { msg(OMC_MSG_ERROR | OMC_MSG_L1, "Failed to initialize delivery context\n"); exit(1);