From 81610697df6f597016a0fdd0c7feaae865d10f14 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sat, 9 Jun 2012 10:09:46 +0200 Subject: [PATCH] xbps_transaction_install_pkg: proper pkg find order in rpool. Previously it was preferring virtual packages from configuration file before real packages. --- include/xbps_api.h | 2 +- lib/transaction_ops.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/xbps_api.h b/include/xbps_api.h index 9064b5c0..701b43bc 100644 --- a/include/xbps_api.h +++ b/include/xbps_api.h @@ -56,7 +56,7 @@ */ #define XBPS_PKGINDEX_VERSION "1.5" -#define XBPS_API_VERSION "20120605-3" +#define XBPS_API_VERSION "20120609" #define XBPS_VERSION "0.16" /** diff --git a/lib/transaction_ops.c b/lib/transaction_ops.c index 155a3fa0..87cda5c1 100644 --- a/lib/transaction_ops.c +++ b/lib/transaction_ops.c @@ -91,8 +91,8 @@ transaction_find_pkg(const char *pkg, bool bypattern, bool best, bool exact, goto out; } } else { - if (((pkg_repod = xbps_rpool_find_virtualpkg_conf(pkg, bypattern)) == NULL) && - ((pkg_repod = xbps_rpool_find_pkg(pkg, bypattern, best)) == NULL) && + if (((pkg_repod = xbps_rpool_find_pkg(pkg, bypattern, best)) == NULL) && + ((pkg_repod = xbps_rpool_find_virtualpkg_conf(pkg, bypattern)) == NULL) && ((pkg_repod = xbps_rpool_find_virtualpkg(pkg, bypattern)) == NULL)) { /* not found */ rv = errno;