From d1dfcd1246f8e5e9f98395ae56a51ca026dad294 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Thu, 14 Mar 2024 15:59:41 -0400 Subject: Fix bug that prevented package deferrals from proceeding when package names contained URLs or version specs --- src/deliverable.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/deliverable.c b/src/deliverable.c index 1f13ea0..65bb0ee 100644 --- a/src/deliverable.c +++ b/src/deliverable.c @@ -896,7 +896,7 @@ static char *requirement_from_test(struct Delivery *ctx, const char *name) { static char result[PATH_MAX]; memset(result, 0, sizeof(result)); for (size_t i = 0; i < sizeof(ctx->tests) / sizeof(ctx->tests[0]); i++) { - if (!strcmp(ctx->tests[i].name, name)) { + if (strstr(name, ctx->tests[i].name)) { sprintf(result, "git+%s@%s", ctx->tests[i].repository, ctx->tests[i].version); @@ -1183,7 +1183,7 @@ void delivery_defer_packages(struct Delivery *ctx, int type) { for (size_t x = 0; x < sizeof(ctx->tests) / sizeof(ctx->tests[0]); x++) { version = NULL; if (ctx->tests[x].name) { - if (startswith(ctx->tests[x].name, name)) { + if (strstr(name, ctx->tests[x].name)) { version = ctx->tests[x].version; ignore_pkg = 1; z++; -- cgit