mirror/pkgconf
1
0
Fork 0
mirror of https://github.com/pkgconf/pkgconf.git synced 2026-01-26 08:07:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

libpkgconf: queue: check final solutions for conflicts before returning OK

Browse Source 
Otherwise, surfaced conflicts will be detected too late.
Closes: https://github.com/pkgconf/pkgconf/issues/436

Signed-off-by: Ariadne Conill <ariadne@ariadne.space>
This commit is contained in:
Ariadne Conill 2026-01-18 21:04:22 -08:00
parent 18e32f2fb6
commit 9cd3629f85
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libpkgconf/queue.c
View File

@ -339,6 +339,18 @@ pkgconf_queue_verify(pkgconf_client_t *client, pkgconf_pkg_t *world, pkgconf_lis
}
}
if (!(client->flags & PKGCONF_PKG_PKGF_SKIP_CONFLICTS))
{
PKGCONF_TRACE(client, "checking for conflicts");
result = pkgconf_pkg_walk_conflicts_list(client, world, &world->conflicts);
if (result != PKGCONF_PKG_ERRF_OK)
{
pkgconf_solution_free(client, &initial_world);
return result;
}
}
/* free the initial solution */
pkgconf_solution_free(client, &initial_world);