diff options
| author | Joseph Hunkeler <jhunkeler@users.noreply.github.com> | 2026-04-07 15:39:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-04-07 15:39:47 -0400 |
| commit | 5b5abcce09da3ce1cc8fab57e1571d0ff0966f7b (patch) | |
| tree | 66e6e8eb470bcae56885d2ca15b67bfdd0b369f3 /src/lib/delivery | |
| parent | d01b465eee667e8efa4aa7c3088dc7af18ea2ab2 (diff) | |
| parent | 666e1f06d6be94114f4db5b2a4cb75d5e1ecb445 (diff) | |
| download | stasis-5b5abcce09da3ce1cc8fab57e1571d0ff0966f7b.tar.gz | |
Merge pull request #123 from jhunkeler/wheel-parser
Implement Python wheel interface
Diffstat (limited to 'src/lib/delivery')
| -rw-r--r-- | src/lib/delivery/delivery_init.c | 2 | ||||
| -rw-r--r-- | src/lib/delivery/delivery_install.c | 6 | ||||
| -rw-r--r-- | src/lib/delivery/include/delivery.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/delivery/delivery_init.c b/src/lib/delivery/delivery_init.c index eb0b527..8a0bb61 100644 --- a/src/lib/delivery/delivery_init.c +++ b/src/lib/delivery/delivery_init.c @@ -119,7 +119,7 @@ void delivery_init_dirs_stage1(struct Delivery *ctx) { } if (access(ctx->storage.mission_dir, F_OK)) { - msg(STASIS_MSG_L1, "%s: %s\n", ctx->storage.mission_dir, strerror(errno)); + msg(STASIS_MSG_L1, "%s: %s: mission directory does not exist\n", ctx->storage.mission_dir, strerror(errno)); exit(1); } diff --git a/src/lib/delivery/delivery_install.c b/src/lib/delivery/delivery_install.c index f40a509..fbd1b8f 100644 --- a/src/lib/delivery/delivery_install.c +++ b/src/lib/delivery/delivery_install.c @@ -252,7 +252,7 @@ int delivery_install_packages(struct Delivery *ctx, char *conda_install_dir, cha } strlist_append_tokenize(tag_data, info->repository_info_tag, "-"); - struct Wheel *whl = NULL; + struct WheelInfo *whl = NULL; char *post_commit = NULL; char *hash = NULL; if (strlist_count(tag_data) > 1) { @@ -264,7 +264,7 @@ int delivery_install_packages(struct Delivery *ctx, char *conda_install_dir, cha // equal to the tag; setuptools_scm auto-increments the value, the user can change it manually, // etc. errno = 0; - whl = get_wheel_info(ctx->storage.wheel_artifact_dir, info->name, + whl = wheelinfo_get(ctx->storage.wheel_artifact_dir, info->name, (char *[]) {ctx->meta.python_compact, ctx->system.arch, "none", "any", post_commit, hash, @@ -282,7 +282,7 @@ int delivery_install_packages(struct Delivery *ctx, char *conda_install_dir, cha info->version = strdup(whl->version); } guard_strlist_free(&tag_data); - wheel_free(&whl); + wheelinfo_free(&whl); } char req[255] = {0}; diff --git a/src/lib/delivery/include/delivery.h b/src/lib/delivery/include/delivery.h index cae4b02..ddc819e 100644 --- a/src/lib/delivery/include/delivery.h +++ b/src/lib/delivery/include/delivery.h @@ -18,7 +18,7 @@ #include "ini.h" #include "multiprocessing.h" #include "recipe.h" -#include "wheel.h" +#include "wheelinfo.h" #define DELIVERY_PLATFORM_MAX 4 #define DELIVERY_PLATFORM_MAXLEN 65 |