From 298a37868c9dfd0b90c5e5b34361c4248be6b109 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Fri, 11 May 2012 21:00:01 -0500 Subject: [PATCH] pkg: return PKG_ERRF_PACKAGE_CONFLICT only if a conflict has been formally verified --- pkg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg.c b/pkg.c index 0890652..f8fd9c3 100644 --- a/pkg.c +++ b/pkg.c @@ -631,11 +631,11 @@ pkg_walk_conflicts_list(pkg_t *root, pkg_dependency_t *deplist, unsigned int fla node->version != NULL ? " " : "", node->version != NULL ? node->version : ""); fprintf(stderr, "It may be possible to ignore this conflict and continue, try the\n"); fprintf(stderr, "PKG_CONFIG_IGNORE_CONFLICTS environment variable.\n"); + + return PKG_ERRF_PACKAGE_CONFLICT; } pkg_free(pkgdep); - - return PKG_ERRF_PACKAGE_CONFLICT; } return PKG_ERRF_OK;