diff options
author | Joseph Hunkeler <jhunkeler@gmail.com> | 2024-03-08 13:04:49 -0500 |
---|---|---|
committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2024-03-08 13:04:49 -0500 |
commit | f295d562e2e0cc44fc9670148f2bc37964f5a4b3 (patch) | |
tree | 98c948fa0c58277c1d4fcb1b2767a4623ecd5bbb /src | |
parent | 655f0ca987311f2947a56302741575d57fcadd74 (diff) | |
download | stasis-f295d562e2e0cc44fc9670148f2bc37964f5a4b3.tar.gz |
Override python version _before_ parsing the configs and rendering template strings
Diffstat (limited to 'src')
-rw-r--r-- | src/main.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -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); |