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

pkg: return PKG_ERRF_PACKAGE_CONFLICT only if a conflict has been formally verified

pull/29/head
William Pitcock 2012-05-11 21:00:01 -05:00
parent 9c335f161a
commit 298a37868c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg.c
View File

@ -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 : ""); 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, "It may be possible to ignore this conflict and continue, try the\n");
fprintf(stderr, "PKG_CONFIG_IGNORE_CONFLICTS environment variable.\n"); fprintf(stderr, "PKG_CONFIG_IGNORE_CONFLICTS environment variable.\n");
return PKG_ERRF_PACKAGE_CONFLICT;
} }
pkg_free(pkgdep); pkg_free(pkgdep);
return PKG_ERRF_PACKAGE_CONFLICT;
} }
return PKG_ERRF_OK; return PKG_ERRF_OK;