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

main: add some very primitive --print-errors support for --atleast-version and friends (closes #115)

pull/116/head
William Pitcock 2017-02-27 10:09:16 -06:00
parent 81011ba522
commit ced4ec00c8
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
main.c
View File

@ -915,7 +915,11 @@ main(int argc, char *argv[])
pkg = pkgconf_pkg_find(&pkg_client, pkgiter->package); pkg = pkgconf_pkg_find(&pkg_client, pkgiter->package);
if (pkg == NULL) if (pkg == NULL)
{
if (want_flags & PKG_PRINT_ERRORS)
pkgconf_error(&pkg_client, "Package '%s' was not found\n", pkgiter->package);
return EXIT_FAILURE; return EXIT_FAILURE;
}
if (pkgconf_compare_version(pkg->version, required_module_version) >= 0) if (pkgconf_compare_version(pkg->version, required_module_version) >= 0)
return EXIT_SUCCESS; return EXIT_SUCCESS;
@ -923,8 +927,7 @@ main(int argc, char *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
else if (required_exact_module_version != NULL)
if (required_exact_module_version != NULL)
{ {
pkgconf_pkg_t *pkg; pkgconf_pkg_t *pkg;
pkgconf_node_t *node; pkgconf_node_t *node;
@ -942,7 +945,11 @@ main(int argc, char *argv[])
pkg = pkgconf_pkg_find(&pkg_client, pkgiter->package); pkg = pkgconf_pkg_find(&pkg_client, pkgiter->package);
if (pkg == NULL) if (pkg == NULL)
{
if (want_flags & PKG_PRINT_ERRORS)
pkgconf_error(&pkg_client, "Package '%s' was not found\n", pkgiter->package);
return EXIT_FAILURE; return EXIT_FAILURE;
}
if (pkgconf_compare_version(pkg->version, required_exact_module_version) == 0) if (pkgconf_compare_version(pkg->version, required_exact_module_version) == 0)
return EXIT_SUCCESS; return EXIT_SUCCESS;
@ -950,8 +957,7 @@ main(int argc, char *argv[])
return EXIT_FAILURE; return EXIT_FAILURE;
} }
else if (required_max_module_version != NULL)
if (required_max_module_version != NULL)
{ {
pkgconf_pkg_t *pkg; pkgconf_pkg_t *pkg;
pkgconf_node_t *node; pkgconf_node_t *node;
@ -969,7 +975,11 @@ main(int argc, char *argv[])
pkg = pkgconf_pkg_find(&pkg_client, pkgiter->package); pkg = pkgconf_pkg_find(&pkg_client, pkgiter->package);
if (pkg == NULL) if (pkg == NULL)
{
if (want_flags & PKG_PRINT_ERRORS)
pkgconf_error(&pkg_client, "Package '%s' was not found\n", pkgiter->package);
return EXIT_FAILURE; return EXIT_FAILURE;
}
if (pkgconf_compare_version(pkg->version, required_max_module_version) <= 0) if (pkgconf_compare_version(pkg->version, required_max_module_version) <= 0)
return EXIT_SUCCESS; return EXIT_SUCCESS;