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

libxbps: make xbps_*_find_virtualpkg_*_by_name funcs work as expected.

Browse Source
This commit is contained in:
Juan RP 2011-10-16 16:52:58 +02:00
parent d551713c01
commit dfa8b8e8ba
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/plist_find.c
View File

@ -146,13 +146,14 @@ find_virtualpkg_user_in_conf(const char *vpkg, bool bypattern)
break; break;
} }
} else { } else {
vpkgname = xbps_pkgpattern_name(vpkgver); vpkgname = xbps_pkg_name(vpkgver);
if (vpkgname == NULL) if (vpkgname == NULL)
break; break;
if (strcmp(vpkg, vpkgname) == 0) { if (strcmp(vpkg, vpkgname) == 0) {
pkg = vpkgname;
free(vpkgname); free(vpkgname);
prop_dictionary_get_cstring_nocopy(obj,
"target-pkgpattern", &pkg);
break; break;
} }
free(vpkgname); free(vpkgname);
@ -170,7 +171,7 @@ find_virtualpkg_user_in_array(prop_array_t array,
{ {
prop_object_t obj = NULL; prop_object_t obj = NULL;
prop_object_iterator_t iter; prop_object_iterator_t iter;
const char *pkgver, *dpkgn, *virtualpkg; const char *pkgver, *virtualpkg;
assert(array != NULL); assert(array != NULL);
assert(str != NULL); assert(str != NULL);
@ -184,17 +185,10 @@ find_virtualpkg_user_in_array(prop_array_t array,
return NULL; return NULL;
while ((obj = prop_object_iterator_next(iter))) { while ((obj = prop_object_iterator_next(iter))) {
if (bypattern) {
prop_dictionary_get_cstring_nocopy(obj, prop_dictionary_get_cstring_nocopy(obj,
"pkgver", &pkgver); "pkgver", &pkgver);
if (xbps_pkgpattern_match(pkgver, virtualpkg)) if (xbps_pkgpattern_match(pkgver, virtualpkg))
break; break;
} else {
prop_dictionary_get_cstring_nocopy(obj,
"pkgname", &dpkgn);
if (strcmp(dpkgn, virtualpkg) == 0)
break;
}
} }
prop_object_iterator_release(iter); prop_object_iterator_release(iter);
return obj; return obj;