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

pkg: add pkg_report_graph_error() for describing breaks in the dependency graph. 

Fixes issue #3.
pull/15/head
William Pitcock 2012-05-03 17:55:06 +00:00
parent 91ec341a92
commit 49a5eddad1
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkg.c
View File

@ -296,7 +296,7 @@ pkg_verify_dependency(pkg_dependency_t *pkgdep, unsigned int flags, unsigned int
if (eflags != NULL) if (eflags != NULL)
*eflags |= PKG_ERRF_PACKAGE_VER_MISMATCH; *eflags |= PKG_ERRF_PACKAGE_VER_MISMATCH;
return NULL; return pkg;
} }
/* /*
@ -311,6 +311,29 @@ pkg_verify_graph(pkg_t *root, int depth, unsigned int flags)
pkg_traverse(root, NULL, NULL, depth, flags); pkg_traverse(root, NULL, NULL, depth, flags);
} }
void
pkg_report_graph_error(pkg_t *pkg, pkg_dependency_t *node, unsigned int eflags)
{
if (eflags & PKG_ERRF_PACKAGE_NOT_FOUND)
{
fprintf(stderr, "Package %s was not found in the pkg-config search path.\n", node->package);
fprintf(stderr, "Perhaps you should add the directory containing `%s.pc'\n", node->package);
fprintf(stderr, "to the PKG_CONFIG_PATH environment variable\n");
fprintf(stderr, "No package '%s' found\n", node->package);
}
else if (eflags & PKG_ERRF_PACKAGE_VER_MISMATCH)
{
fprintf(stderr, "Package dependency requirement '%s %s %s' could not be satisfied.\n",
node->package, pkg_get_comparator(node), node->version);
if (pkg != NULL)
fprintf(stderr, "Package '%s' has version '%s', required version is '%s %s'\n",
node->package, pkg->version, pkg_get_comparator(node), node->version);
}
exit(EXIT_FAILURE);
}
static inline void static inline void
pkg_walk_list(pkg_dependency_t *deplist, pkg_walk_list(pkg_dependency_t *deplist,
void (*pkg_traverse_func)(pkg_t *package, void *data), void (*pkg_traverse_func)(pkg_t *package, void *data),
@ -329,17 +352,8 @@ pkg_walk_list(pkg_dependency_t *deplist,
continue; continue;
pkgdep = pkg_verify_dependency(node, flags, &eflags); pkgdep = pkg_verify_dependency(node, flags, &eflags);
if (pkgdep == NULL) if (eflags != PKG_ERRF_OK)
{ return pkg_report_graph_error(pkgdep, node, eflags);
if (eflags & PKG_ERRF_PACKAGE_NOT_FOUND)
{
fprintf(stderr, "Package %s was not found in the pkg-config search path.\n", node->package);
fprintf(stderr, "Perhaps you should add the directory containing `%s.pc'\n", node->package);
fprintf(stderr, "to the PKG_CONFIG_PATH environment variable\n");
fprintf(stderr, "No package '%s' found\n", node->package);
}
exit(EXIT_FAILURE);
}
pkg_traverse(pkgdep, pkg_traverse_func, data, maxdepth - 1, flags); pkg_traverse(pkgdep, pkg_traverse_func, data, maxdepth - 1, flags);
} }