Improve dependency matching via repos and use the "pkgver" object

in pkg dictionary to improve performance in some cases.

Bumped XBPS_RELVER to 20091121.

--HG--
extra : convert_revision : xtraeme%40gmail.com-20091122041547-oywx4db75j8uttl3
This commit is contained in:
Juan RP
2009-11-22 05:15:47 +01:00
parent 71ea9d2d1f
commit 3d24672e58
8 changed files with 79 additions and 73 deletions

View File

@ -115,8 +115,8 @@ int SYMEXPORT
xbps_check_is_installed_pkg(const char *pkg)
{
prop_dictionary_t dict;
const char *instver;
char *pkgname, *instpkg;
const char *instpkgver;
char *pkgname;
int rv = 0;
pkg_state_t state = 0;
@ -146,18 +146,15 @@ xbps_check_is_installed_pkg(const char *pkg)
free(pkgname);
return 0; /* not fully installed */
}
/* Get version from installed package */
prop_dictionary_get_cstring_nocopy(dict, "version", &instver);
instpkg = xbps_xasprintf("%s-%s", pkgname, instver);
free(pkgname);
if (instpkg == NULL) {
instpkgver = xbps_get_pkgver_from_dict(dict);
if (instpkgver == NULL) {
prop_object_release(dict);
return -1;
}
/* Check if installed pkg is matched against pkgdep pattern */
rv = xbps_pkgdep_match(instpkg, __UNCONST(pkg));
free(instpkg);
rv = xbps_pkgdep_match(instpkgver, __UNCONST(pkg));
prop_object_release(dict);
return rv;
@ -269,6 +266,17 @@ xbps_get_pkgdep_version(const char *pkg)
return res;
}
const char SYMEXPORT *
xbps_get_pkgver_from_dict(prop_dictionary_t d)
{
const char *pkgver;
assert(d != NULL);
prop_dictionary_get_cstring_nocopy(d, "pkgver", &pkgver);
return pkgver;
}
static char *
get_pkg_index_remote_plist(const char *uri, const char *machine)
{