dcbaker
/
pkgconf
forked from ariadne/pkgconf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkg: list all depgraph breaks (this is technically different than pkg-config, but nobody reads stderr)

feature/tap-sh
William Pitcock 2013-03-15 20:09:54 -05:00
parent f9d93a1f81
commit 18153786a2
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg.c
View File

@ -822,11 +822,18 @@ pkg_verify_graph(pkg_t *root, int depth, unsigned int flags)
static unsigned int static unsigned int
pkg_report_graph_error(pkg_t *parent, pkg_t *pkg, pkg_dependency_t *node, unsigned int eflags) pkg_report_graph_error(pkg_t *parent, pkg_t *pkg, pkg_dependency_t *node, unsigned int eflags)
{ {
static bool already_sent_notice = false;
if (eflags & PKG_ERRF_PACKAGE_NOT_FOUND) if (eflags & PKG_ERRF_PACKAGE_NOT_FOUND)
{
if (!already_sent_notice)
{ {
fprintf(error_msgout, "Package %s was not found in the pkg-config search path.\n", node->package); fprintf(error_msgout, "Package %s was not found in the pkg-config search path.\n", node->package);
fprintf(error_msgout, "Perhaps you should add the directory containing `%s.pc'\n", node->package); fprintf(error_msgout, "Perhaps you should add the directory containing `%s.pc'\n", node->package);
fprintf(error_msgout, "to the PKG_CONFIG_PATH environment variable\n"); fprintf(error_msgout, "to the PKG_CONFIG_PATH environment variable\n");
already_sent_notice = true;
}
fprintf(error_msgout, "Package '%s', required by '%s', not found\n", node->package, parent->id); fprintf(error_msgout, "Package '%s', required by '%s', not found\n", node->package, parent->id);
} }
else if (eflags & PKG_ERRF_PACKAGE_VER_MISMATCH) else if (eflags & PKG_ERRF_PACKAGE_VER_MISMATCH)
@ -858,15 +865,24 @@ pkg_walk_list(pkg_t *parent,
PKG_FOREACH_LIST_ENTRY(deplist->head, node) PKG_FOREACH_LIST_ENTRY(deplist->head, node)
{ {
unsigned int eflags_local = PKG_ERRF_OK;
pkg_dependency_t *depnode = node->data; pkg_dependency_t *depnode = node->data;
pkg_t *pkgdep; pkg_t *pkgdep;
if (*depnode->package == '\0') if (*depnode->package == '\0')
continue; continue;
pkgdep = pkg_verify_dependency(depnode, flags, &eflags); pkgdep = pkg_verify_dependency(depnode, flags, &eflags_local);
if (eflags != PKG_ERRF_OK && !(flags & PKGF_SKIP_ERRORS))
return pkg_report_graph_error(parent, pkgdep, depnode, eflags); eflags |= eflags_local;
if (eflags_local != PKG_ERRF_OK && !(flags & PKGF_SKIP_ERRORS))
{
pkg_report_graph_error(parent, pkgdep, depnode, eflags_local);
continue;
}
if (pkgdep == NULL)
continue;
if (pkgdep->flags & PKG_PROPF_SEEN) if (pkgdep->flags & PKG_PROPF_SEEN)
{ {
pkg_unref(pkgdep); pkg_unref(pkgdep);
@ -877,10 +893,6 @@ pkg_walk_list(pkg_t *parent,
eflags = pkg_traverse(pkgdep, func, data, depth - 1, flags); eflags = pkg_traverse(pkgdep, func, data, depth - 1, flags);
pkgdep->flags &= ~PKG_PROPF_SEEN; pkgdep->flags &= ~PKG_PROPF_SEEN;
pkg_unref(pkgdep); pkg_unref(pkgdep);
/* optimization: if a break has been found in the depgraph, quit walking it */
if (eflags != PKG_ERRF_OK)
break;
} }
return eflags; return eflags;