aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Hunkeler <jhunkeler@gmail.com>2024-02-13 00:04:05 -0500
committerJoseph Hunkeler <jhunkeler@gmail.com>2024-02-13 00:04:05 -0500
commitdeaff24e42c8f3687ffe6bae549a04bc2f0a35aa (patch)
treea8c0f1f9ffccc18ad7f45a609bb98a2e9fe9e610
parent045ceffe926f6c6530a9c15e81739b6c849b451a (diff)
downloadstasis-deaff24e42c8f3687ffe6bae549a04bc2f0a35aa.tar.gz
Generate release string after parsing release format string
-rw-r--r--src/deliverable.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/deliverable.c b/src/deliverable.c
index 7f7dabf..ce8972e 100644
--- a/src/deliverable.c
+++ b/src/deliverable.c
@@ -419,6 +419,11 @@ int delivery_init(struct Delivery *ctx, struct INIFILE *ini, struct INIFILE *cfg
getter_required(ctx->rules._handle, "meta", "release_fmt", INIVAL_TYPE_STR)
conv_str(ctx, rules.release_fmt)
+ if (delivery_format_str(ctx, &ctx->info.release_name, ctx->rules.release_fmt)) {
+ fprintf(stderr, "Failed to generate release name. Format used: %s\n", ctx->rules.release_fmt);
+ return -1;
+ }
+
ctx->conda.conda_packages_defer = strlist_init();
ctx->conda.pip_packages_defer = strlist_init();
@@ -498,7 +503,6 @@ int delivery_init(struct Delivery *ctx, struct INIFILE *ini, struct INIFILE *cfg
char env_name[NAME_MAX];
char env_date[NAME_MAX];
- ctx->meta.python_compact = to_short_version(ctx->meta.python);
/*
if (!strcasecmp(ctx->meta.mission, "hst") && ctx->meta.final) {
@@ -517,11 +521,6 @@ int delivery_init(struct Delivery *ctx, struct INIFILE *ini, struct INIFILE *cfg
ctx->meta.name, ctx->meta.version, ctx->system.platform[DELIVERY_PLATFORM_RELEASE], ctx->system.arch, ctx->meta.python_compact, ctx->meta.rc);
}
*/
- if (delivery_format_str(ctx, &ctx->info.release_name, ctx->rules.release_fmt)) {
- fprintf(stderr, "Failed to generate release name. Format used: %s\n", ctx->rules.release_fmt);
- return -1;
- }
-
return 0;
}