ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

Clarify tracing messages

master
Kai Pastor 2024-02-23 15:18:08 +01:00 committed by Ariadne Conill
parent 5eb79f6651
commit 4090ba3e0d
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libpkgconf/pkg.c
View File

@ -1658,21 +1658,23 @@ pkgconf_pkg_traverse_main(pkgconf_client_t *client,
func(client, root, data); func(client, root, data);
} }
if (!(client->flags & PKGCONF_PKG_PKGF_SKIP_CONFLICTS)) if (!(client->flags & PKGCONF_PKG_PKGF_SKIP_CONFLICTS) && root->conflicts.head != NULL)
{ {
PKGCONF_TRACE(client, "%s: walking 'Conflicts' list", root->id);
eflags = pkgconf_pkg_walk_conflicts_list(client, root, &root->conflicts); eflags = pkgconf_pkg_walk_conflicts_list(client, root, &root->conflicts);
if (eflags != PKGCONF_PKG_ERRF_OK) if (eflags != PKGCONF_PKG_ERRF_OK)
return eflags; return eflags;
} }
PKGCONF_TRACE(client, "%s: walking requires list", root->id); PKGCONF_TRACE(client, "%s: walking 'Requires' list", root->id);
eflags = pkgconf_pkg_walk_list(client, root, &root->required, func, data, maxdepth, skip_flags); eflags = pkgconf_pkg_walk_list(client, root, &root->required, func, data, maxdepth, skip_flags);
if (eflags != PKGCONF_PKG_ERRF_OK) if (eflags != PKGCONF_PKG_ERRF_OK)
return eflags; return eflags;
if (client->flags & PKGCONF_PKG_PKGF_SEARCH_PRIVATE) if (client->flags & PKGCONF_PKG_PKGF_SEARCH_PRIVATE)
{ {
PKGCONF_TRACE(client, "%s: walking requires.private list", root->id); PKGCONF_TRACE(client, "%s: walking 'Requires.private' list", root->id);
/* XXX: ugly */ /* XXX: ugly */
client->flags |= PKGCONF_PKG_PKGF_ITER_PKG_IS_PRIVATE; client->flags |= PKGCONF_PKG_PKGF_ITER_PKG_IS_PRIVATE;

4
libpkgconf/queue.c
View File

@ -258,12 +258,12 @@ pkgconf_queue_verify(pkgconf_client_t *client, pkgconf_pkg_t *world, pkgconf_lis
*/ */
++client->serial; ++client->serial;
PKGCONF_TRACE(client, "flattening requires deps"); PKGCONF_TRACE(client, "flattening 'Requires' deps");
flatten_dependency_set(client, &world->required); flatten_dependency_set(client, &world->required);
++client->serial; ++client->serial;
PKGCONF_TRACE(client, "flattening requires.private deps"); PKGCONF_TRACE(client, "flattening 'Requires.private' deps");
flatten_dependency_set(client, &world->requires_private); flatten_dependency_set(client, &world->requires_private);
return PKGCONF_PKG_ERRF_OK; return PKGCONF_PKG_ERRF_OK;