diff options
| author | Joseph Hunkeler <jhunkeler@users.noreply.github.com> | 2026-06-30 07:44:33 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-06-30 07:44:33 -0400 |
| commit | 4a189db63597c66b15101ba0344494f49d9af3b1 (patch) | |
| tree | 237870064c5868fdd68e093f50c7e415c480b614 /src/lib/delivery | |
| parent | 5e0b3fbefebaeff1fa5bfb338c760b9b9e270f02 (diff) | |
| parent | 9547b304ce8c53574b3a877f8416898fbb8bea77 (diff) | |
| download | stasis-4a189db63597c66b15101ba0344494f49d9af3b1.tar.gz | |
Merge pull request #150 from jhunkeler/bugfix-1003
Bugfix 0x1003
Diffstat (limited to 'src/lib/delivery')
| -rw-r--r-- | src/lib/delivery/delivery_build.c | 6 | ||||
| -rw-r--r-- | src/lib/delivery/delivery_test.c | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/lib/delivery/delivery_build.c b/src/lib/delivery/delivery_build.c index 9ef5d92..7ea5b29 100644 --- a/src/lib/delivery/delivery_build.c +++ b/src/lib/delivery/delivery_build.c @@ -466,6 +466,7 @@ struct StrList *delivery_build_wheels(struct Delivery *ctx) { if (mkdirs(outdir, 0755)) { SYSERROR("failed to create output directory: %s", outdir); guard_strlist_free(&result); + popd(); return NULL; } if (use_builder_manylinux) { @@ -474,18 +475,21 @@ struct StrList *delivery_build_wheels(struct Delivery *ctx) { ctx->tests->test[i]->version); guard_strlist_free(&result); guard_free(cmd); + popd(); return NULL; } } else if (use_builder_build || use_builder_cibuildwheel) { if (use_builder_build) { if (asprintf(&cmd, "-m build -w -o %s", outdir) < 0) { SYSERROR("Unable to allocate memory for build command"); + popd(); return NULL; } } else if (use_builder_cibuildwheel) { if (asprintf(&cmd, "-m cibuildwheel --output-dir %s --only cp%s-manylinux_%s", outdir, ctx->meta.python_compact, ctx->system.arch) < 0) { SYSERROR("Unable to allocate memory for cibuildwheel command"); + popd(); return NULL; } } @@ -495,10 +499,12 @@ struct StrList *delivery_build_wheels(struct Delivery *ctx) { ctx->tests->test[i]->version); guard_strlist_free(&result); guard_free(cmd); + popd(); return NULL; } } else { SYSERROR("unknown wheel builder backend: %s", globals.wheel_builder); + popd(); return NULL; } diff --git a/src/lib/delivery/delivery_test.c b/src/lib/delivery/delivery_test.c index c1ef1ad..4ea3b3d 100644 --- a/src/lib/delivery/delivery_test.c +++ b/src/lib/delivery/delivery_test.c @@ -160,7 +160,7 @@ void delivery_tests_run(struct Delivery *ctx) { if (!access(destdir, F_OK)) { msg(STASIS_MSG_L3, "Purging repository %s\n", destdir); if (rmtree(destdir)) { - COE_CHECK_ABORT(1, "Unable to remove repository\n"); + COE_CHECK_ABORT(1, "Unable to remove repository"); } } msg(STASIS_MSG_L3, "Cloning repository %s\n", test->repository); @@ -168,7 +168,7 @@ void delivery_tests_run(struct Delivery *ctx) { test->repository_info_tag = strdup(git_describe(destdir)); test->repository_info_ref = strdup(git_rev_parse(destdir, "HEAD")); } else { - COE_CHECK_ABORT(1, "Unable to clone repository\n"); + COE_CHECK_ABORT(1, "Unable to clone repository"); } if (test->repository_remove_tags && strlist_count(test->repository_remove_tags)) { @@ -176,7 +176,7 @@ void delivery_tests_run(struct Delivery *ctx) { } if (pushd(destdir)) { - COE_CHECK_ABORT(1, "Unable to enter repository directory\n"); + COE_CHECK_ABORT(1, "Unable to enter repository directory"); } else { const int dep_status = check_python_package_dependencies("."); if (dep_status) { @@ -217,6 +217,7 @@ void delivery_tests_run(struct Delivery *ctx) { if (test->disable) { msg(STASIS_MSG_L2, "Script execution disabled by configuration\n", test->name); guard_free(cmd); + popd(); continue; } |