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

xbps_check_is_installed_pkg: simplify.

Browse Source
This commit is contained in:
Juan RP 2011-01-26 18:41:57 +01:00
parent f06a605854
commit 4b3b50c6ef
1 changed files with 6 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/util.c
View File

@ -162,69 +162,37 @@ xbps_check_is_repo_string_remote(const char *uri)
return false; return false;
} }
static const char *
xbps_get_pkgver_from_dict(prop_dictionary_t d)
{
const char *pkgver = NULL;
assert(d != NULL);
prop_dictionary_get_cstring_nocopy(d, "pkgver", &pkgver);
return pkgver;
}
int int
xbps_check_is_installed_pkg(const char *pkg) xbps_check_is_installed_pkg(const char *pattern)
{ {
prop_dictionary_t dict; prop_dictionary_t dict;
const char *instpkgver = NULL; pkg_state_t state;
char *pkgname;
int rv = 0;
pkg_state_t state = 0;
assert(pkg != NULL); assert(pkg != NULL);
pkgname = xbps_get_pkgpattern_name(pkg); dict = xbps_find_pkg_dict_installed(pattern, true);
if (pkgname == NULL)
return -1;
dict = xbps_find_pkg_dict_installed(pkgname, false);
if (dict == NULL) { if (dict == NULL) {
free(pkgname);
if (errno == ENOENT) { if (errno == ENOENT) {
errno = 0; errno = 0;
return 0; /* not installed */ return 0; /* not installed */
} }
return -1; return -1; /* error */
} }
/* /*
* Check that package state is fully installed, not * Check that package state is fully installed, not
* unpacked or something else. * unpacked or something else.
*/ */
if (xbps_get_pkg_state_dictionary(dict, &state) != 0) { if (xbps_get_pkg_state_dictionary(dict, &state) != 0) {
prop_object_release(dict); prop_object_release(dict);
free(pkgname); return -1; /* error */
return -1;
} }
if (state != XBPS_PKG_STATE_INSTALLED) { if (state != XBPS_PKG_STATE_INSTALLED) {
prop_object_release(dict); prop_object_release(dict);
free(pkgname);
return 0; /* not fully installed */ return 0; /* not fully installed */
} }
free(pkgname);
/* Check if installed pkg is matched against pkgdep pattern */
instpkgver = xbps_get_pkgver_from_dict(dict);
if (instpkgver == NULL) {
prop_object_release(dict);
return -1;
}
rv = xbps_pkgpattern_match(instpkgver, __UNCONST(pkg));
prop_object_release(dict); prop_object_release(dict);
return rv; return 1;
} }
bool bool