diff options
author | Joseph Hunkeler <jhunkeler@gmail.com> | 2024-10-21 12:11:05 -0400 |
---|---|---|
committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2024-10-21 12:11:05 -0400 |
commit | 5d21c2c6eab632cc519eb23e529c2d985ac04921 (patch) | |
tree | 1d6675040d6ff6ade3457e6133b38a36694eba47 /src/lib | |
parent | f954efd16b99520720d05abde5ec8ff741faa2dd (diff) | |
download | stasis-5d21c2c6eab632cc519eb23e529c2d985ac04921.tar.gz |
Change signature:
* delivery_gather_tool_versions now returns non-zero if unable to determine a tool's version
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/core/delivery.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/lib/core/delivery.c b/src/lib/core/delivery.c index e32ed4c..5645dcc 100644 --- a/src/lib/core/delivery.c +++ b/src/lib/core/delivery.c @@ -302,16 +302,22 @@ void delivery_defer_packages(struct Delivery *ctx, int type) { } } -void delivery_gather_tool_versions(struct Delivery *ctx) { - int status = 0; +int delivery_gather_tool_versions(struct Delivery *ctx) { + int status_tool_version = 0; + int status_tool_build_version = 0; // Extract version from tool output - ctx->conda.tool_version = shell_output("conda --version", &status); + ctx->conda.tool_version = shell_output("conda --version", &status_tool_version); if (ctx->conda.tool_version) strip(ctx->conda.tool_version); - ctx->conda.tool_build_version = shell_output("conda build --version", &status); + ctx->conda.tool_build_version = shell_output("conda build --version", &status_tool_build_version); if (ctx->conda.tool_build_version) strip(ctx->conda.tool_version); + + if (status_tool_version || status_tool_build_version) { + return 1; + } + return 0; } |