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

rename xbps_pkgver_is_reverted to xbps_pkg_reverts

Browse Source
This commit is contained in:
Enno Boland 2014-09-23 09:51:11 +02:00
parent cd9a9e78a8
commit 50fb6c1605
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bin/xbps-rindex/index-add.c
View File

@ -122,14 +122,14 @@ index_add(struct xbps_handle *xhp, int argc, char **argv, bool force)
* If the current package reverts the package in the index, consider * If the current package reverts the package in the index, consider
* the current package as the newer one. * the current package as the newer one.
*/ */
if(ret < 0 && xbps_pkgver_is_reverted(pkgver, curpkgd)) { if(ret < 0 && xbps_pkg_reverts(curpkgd, pkgver)) {
ret = 1; ret = 1;
} }
/* /*
* If package in the index reverts current package, consider the * If package in the index reverts current package, consider the
* package in the index as the newer one. * package in the index as the newer one.
*/ */
else if (ret < 0 && xbps_pkgver_is_reverted(opkgver, binpkgd)) { else if (ret < 0 && xbps_pkg_reverts(binpkgd, opkgver)) {
ret = -1; ret = -1;
} }

4
include/xbps.h.in
View File

@ -1841,12 +1841,12 @@ int xbps_humanize_number(char *buf, int64_t bytes);
* The package version is defined by: * The package version is defined by:
* ${VERSION}_${REVISION}. * ${VERSION}_${REVISION}.
* *
* @param[in] pkgver a package version string
* @param[in] pkg a package which is a candidate to revert pkgver. * @param[in] pkg a package which is a candidate to revert pkgver.
* @param[in] pkgver a package version string
* *
* @return 1 if pkg reverts pkgver, 0 otherwise. * @return 1 if pkg reverts pkgver, 0 otherwise.
*/ */
int xbps_pkgver_is_reverted(const char *pkgver, xbps_dictionary_t pkg); int xbps_pkg_reverts(xbps_dictionary_t pkg, const char *pkgver);
/** /**
* Compares package version strings. * Compares package version strings.

2
lib/transaction_ops.c
View File

@ -118,7 +118,7 @@ trans_find_pkg(struct xbps_handle *xhp, const char *pkg, bool reinstall)
xbps_dictionary_get_cstring_nocopy(pkg_pkgdb, xbps_dictionary_get_cstring_nocopy(pkg_pkgdb,
"pkgver", &instpkgver); "pkgver", &instpkgver);
if (xbps_cmpver(repopkgver, instpkgver) <= 0 && if (xbps_cmpver(repopkgver, instpkgver) <= 0 &&
!xbps_pkgver_is_reverted(repopkgver, pkg_repod)) { !xbps_pkg_reverts(pkg_repod, repopkgver)) {
xbps_dbg_printf(xhp, "[rpool] Skipping `%s' " xbps_dbg_printf(xhp, "[rpool] Skipping `%s' "
"(installed: %s) from repository `%s'\n", "(installed: %s) from repository `%s'\n",
repopkgver, instpkgver, repoloc); repopkgver, instpkgver, repoloc);

2
lib/util.c
View File

@ -430,7 +430,7 @@ xbps_humanize_number(char *buf, int64_t bytes)
* Check if pkg is explicitly marked to replace a specific installed version. * Check if pkg is explicitly marked to replace a specific installed version.
*/ */
int int
xbps_pkgver_is_reverted(const char *pkgver, xbps_dictionary_t pkg) { xbps_pkg_reverts(xbps_dictionary_t pkg, const char *pkgver) {
unsigned int i; unsigned int i;
xbps_array_t reverts; xbps_array_t reverts;
const char *revertver; const char *revertver;