From f7406afc5b82341aae48d7457b1e8fa2818b6c30 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Tue, 5 Dec 2017 18:04:42 -0600 Subject: [PATCH] libpkgconf: pkg: do not mention PKG_CONFIG_SKIP_CONFLICTS env var when simplified errors are requested (closes #134) --- libpkgconf/pkg.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libpkgconf/pkg.c b/libpkgconf/pkg.c index 0e8c39f..c8edcb0 100644 --- a/libpkgconf/pkg.c +++ b/libpkgconf/pkg.c @@ -1435,8 +1435,12 @@ pkgconf_pkg_walk_conflicts_list(pkgconf_client_t *client, pkgconf_error(client, "Version '%s' of '%s' conflicts with '%s' due to satisfying conflict rule '%s %s%s%s'.\n", pkgdep->version, pkgdep->realname, root->realname, parentnode->package, pkgconf_pkg_get_comparator(parentnode), parentnode->version != NULL ? " " : "", parentnode->version != NULL ? parentnode->version : ""); - pkgconf_error(client, "It may be possible to ignore this conflict and continue, try the\n"); - pkgconf_error(client, "PKG_CONFIG_IGNORE_CONFLICTS environment variable.\n"); + + if (!(client->flags & PKGCONF_PKG_PKGF_SIMPLIFY_ERRORS)) + { + pkgconf_error(client, "It may be possible to ignore this conflict and continue, try the\n"); + pkgconf_error(client, "PKG_CONFIG_IGNORE_CONFLICTS environment variable.\n"); + } pkgconf_pkg_unref(client, pkgdep);