Initialize sysconfdir early

2 files changed, 5 insertions, 2 deletions

diff --git a/src/cli/stasis/stasis_main.c b/src/cli/stasis/stasis_main.c
index 48504b9..90c2219 100644
--- a/src/cli/stasis/stasis_main.c
+++ b/src/cli/stasis/stasis_main.c
@@ -512,6 +512,8 @@ int main(int argc, char *argv[]) {
     memset(&proc, 0, sizeof(proc));
     memset(&ctx, 0, sizeof(ctx));
 
+    setup_sysconfdir();
+
     int c;
     int option_index = 0;
     while ((c = getopt_long(argc, argv, "hVCc:p:vU", long_options, &option_index)) != -1) {
@@ -640,7 +642,6 @@ int main(int argc, char *argv[]) {
     tpl_setup_vars(&ctx);
     tpl_setup_funcs(&ctx);
 
-    setup_sysconfdir();
     setup_python_version_override(&ctx, python_override_version);
 
     configure_stasis_ini(&ctx, &config_input);
diff --git a/src/lib/delivery/delivery_populate.c b/src/lib/delivery/delivery_populate.c
index 48ea7b3..3fd01b9 100644
--- a/src/lib/delivery/delivery_populate.c
+++ b/src/lib/delivery/delivery_populate.c
@@ -234,7 +234,9 @@ int populate_delivery_ini(struct Delivery *ctx, int render_mode) {
     normalize_ini_list(&ini, &ctx->conda.pip_packages_purge, "conda", "pip_packages_purge", render_mode);
 
     // Delivery metadata consumed
-    populate_mission_ini(&ctx, render_mode);
+    if (populate_mission_ini(&ctx, render_mode)) {
+        return -1;
+    }
 
     if (ctx->info.release_name) {
         guard_free(ctx->info.release_name);