diff --git a/NEWS b/NEWS index 00fb01a8..debd2aad 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,9 @@ xbps-0.15 (???): + * When sorting required dependencies make sure that a pkg with + required version is taken into account, not just the first + one matching its pkgname. + * When resolving required dependencies also find the best pkg available in repository pool. Thanks to dave for testing! diff --git a/include/xbps_api.h b/include/xbps_api.h index 1ab99178..ead31510 100644 --- a/include/xbps_api.h +++ b/include/xbps_api.h @@ -56,7 +56,7 @@ */ #define XBPS_PKGINDEX_VERSION "1.4" -#define XBPS_API_VERSION "20120328" +#define XBPS_API_VERSION "20120330" #define XBPS_VERSION "0.15" /** diff --git a/lib/transaction_sortdeps.c b/lib/transaction_sortdeps.c index 8773e90c..8203a8d0 100644 --- a/lib/transaction_sortdeps.c +++ b/lib/transaction_sortdeps.c @@ -216,7 +216,7 @@ again: xbps_dbg_printf(" Required dependency '%s': ", str); pdn = pkgdep_find(pkgnamedep, NULL); if ((pdn == NULL) && - xbps_check_is_installed_pkg_by_name(pkgnamedep)) { + xbps_check_is_installed_pkg_by_pattern(str)) { /* * Package dependency is installed, just add to * the list but just mark it as "installed", to avoid