diff options
| author | Joseph Hunkeler <jhunkeler@users.noreply.github.com> | 2025-03-20 19:48:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-20 19:48:13 -0400 |
| commit | 5da81c51855b99bc8118d15dce7b8063af8a9afe (patch) | |
| tree | ce785d03c64cf66c41fa8430f10dbce76810e06b /src/lib/delivery/delivery_install.c | |
| parent | 9a8407077c036db8d7d4cc4f790e74cbff412514 (diff) | |
| parent | edd6f8819fdfdc900cc5069665c6fac73ea14edf (diff) | |
| download | stasis-5da81c51855b99bc8118d15dce7b8063af8a9afe.tar.gz | |
Merge pull request #101 from jhunkeler/without-extras-in-spec
Without extras in spec
Diffstat (limited to 'src/lib/delivery/delivery_install.c')
| -rw-r--r-- | src/lib/delivery/delivery_install.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/delivery/delivery_install.c b/src/lib/delivery/delivery_install.c index cf6ccaa..246c604 100644 --- a/src/lib/delivery/delivery_install.c +++ b/src/lib/delivery/delivery_install.c @@ -35,6 +35,7 @@ static char *have_spec_in_config(const struct Delivery *ctx, const char *name) { } else { strncpy(package, config_spec, sizeof(package) - 1); } + remove_extras(package); if (strncmp(package, name, strlen(package)) == 0) { return config_spec; } @@ -63,7 +64,9 @@ int delivery_overlay_packages_from_env(struct Delivery *ctx, const char *env_nam guard_free(current_env); struct StrList *frozen_list = strlist_init(); - strlist_append_tokenize(frozen_list, freeze_output, LINE_SEP); + if (!isempty(freeze_output)) { + strlist_append_tokenize(frozen_list, freeze_output, LINE_SEP); + } guard_free(freeze_output); struct StrList *new_list = strlist_init(); @@ -221,9 +224,10 @@ int delivery_install_packages(struct Delivery *ctx, char *conda_install_dir, cha if (!ctx->meta.based_on) { strcat(cmd, " --upgrade"); } - sprintf(cmd + strlen(cmd), " --extra-index-url 'file://%s'", ctx->storage.wheel_artifact_dir); } + sprintf(cmd + strlen(cmd), " --extra-index-url 'file://%s'", ctx->storage.wheel_artifact_dir); + for (size_t x = 0; manifest[x] != NULL; x++) { char *name = NULL; for (size_t p = 0; p < strlist_count(manifest[x]); p++) { |