diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2024-01-31 13:06:16 -0500 | 
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2024-01-31 13:06:16 -0500 | 
| commit | 1f7ebb234761d8aa5edf0ea784c2dd9e2e247218 (patch) | |
| tree | dffa1c7b5a344ceea11fecffb8ac1d5d3139ba70 /src/deliverable.c | |
| parent | 633c3c257807449d196cb9c9380a1f819a37cf67 (diff) | |
| download | stasis-1f7ebb234761d8aa5edf0ea784c2dd9e2e247218.tar.gz | |
Fix up mission directory handler
Diffstat (limited to 'src/deliverable.c')
| -rw-r--r-- | src/deliverable.c | 26 | 
1 files changed, 26 insertions, 0 deletions
| diff --git a/src/deliverable.c b/src/deliverable.c index b77502c..e7d47f5 100644 --- a/src/deliverable.c +++ b/src/deliverable.c @@ -137,6 +137,7 @@ void delivery_free(struct Delivery *ctx) {      guard_free(ctx->storage.build_recipes_dir)      guard_free(ctx->storage.build_sources_dir)      guard_free(ctx->storage.build_testing_dir) +    guard_free(ctx->storage.mission_dir);      guard_free(ctx->conda.installer_baseurl)      guard_free(ctx->conda.installer_name)      guard_free(ctx->conda.installer_version) @@ -189,6 +190,21 @@ void delivery_init_dirs(struct Delivery *ctx) {      ctx->storage.conda_artifact_dir = realpath("omc/output/packages/conda", NULL);      ctx->storage.wheel_artifact_dir = realpath("omc/output/packages/wheels", NULL); +    // Configure mission directory +    if (!ctx->storage.mission_dir) { +        ctx->storage.mission_dir = join( +                (char *[]) { +                        globals.sysconfdir, +                        "mission", +                        NULL +                }, +                DIR_SEP); +    } +    if (access(ctx->storage.mission_dir, F_OK)) { +        msg(OMC_MSG_L1, "%s: %s\n", ctx->storage.mission_dir, strerror(errno)); +        exit(1); +    } +      // Override installation prefix using global configuration key      if (globals.conda_install_prefix && strlen(globals.conda_install_prefix)) {          // user wants a specific path @@ -501,7 +517,17 @@ int delivery_format_str(struct Delivery *ctx, char **dest, const char *fmt) {      return 0;  } +void delivery_debug_show(struct Delivery *ctx) { +    printf("\n====DEBUG====\n"); +    printf("%-20s %-10s\n", "[DEBUG] system configuration directory:", globals.sysconfdir); +    printf("%-20s %-10s\n", "[DEBUG] mission directory:", ctx->storage.mission_dir); +} +  void delivery_meta_show(struct Delivery *ctx) { +    if (globals.verbose) { +        delivery_debug_show(ctx); +    } +      printf("\n====DELIVERY====\n");      printf("%-20s %-10s\n", "Target Python:", ctx->meta.python);      printf("%-20s %-10s\n", "Name:", ctx->meta.name); | 
