emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps_transaction_install_pkg: proper pkg find order in rpool.

Browse Source 
Previously it was preferring virtual packages from
configuration file before real packages.
This commit is contained in:
Juan RP 2012-06-09 10:09:46 +02:00
parent 20bb1af589
commit 81610697df
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/xbps_api.h
View File

@ -56,7 +56,7 @@
*/ */
#define XBPS_PKGINDEX_VERSION "1.5" #define XBPS_PKGINDEX_VERSION "1.5"
#define XBPS_API_VERSION "20120605-3" #define XBPS_API_VERSION "20120609"
#define XBPS_VERSION "0.16" #define XBPS_VERSION "0.16"
/** /**

4
lib/transaction_ops.c
View File

@ -91,8 +91,8 @@ transaction_find_pkg(const char *pkg, bool bypattern, bool best, bool exact,
goto out; goto out;
} }
} else { } else {
if (((pkg_repod = xbps_rpool_find_virtualpkg_conf(pkg, bypattern)) == NULL) && if (((pkg_repod = xbps_rpool_find_pkg(pkg, bypattern, best)) == NULL) &&
((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)) { ((pkg_repod = xbps_rpool_find_virtualpkg(pkg, bypattern)) == NULL)) {
/* not found */ /* not found */
rv = errno; rv = errno;