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

xbps_find_pkg_in_*: search for virtual pkg before the real one.

Browse Source
This commit is contained in:
Juan RP
2011-01-29 17:57:01 +01:00
parent 7c8a89c968
commit 5bbbb3c8fd
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/plist.c
View File

@@ -266,19 +266,19 @@ find_pkg_in_array(prop_array_t array, const char *str, bool bypattern)
while ((obj = prop_object_iterator_next(iter))) { while ((obj = prop_object_iterator_next(iter))) {
if (bypattern) { if (bypattern) {
if (xbps_find_virtual_pkg_in_dict(obj, str, true))
break;
prop_dictionary_get_cstring_nocopy(obj, prop_dictionary_get_cstring_nocopy(obj,
"pkgver", &pkgver); "pkgver", &pkgver);
if (xbps_pkgpattern_match(pkgver, __UNCONST(str))) if (xbps_pkgpattern_match(pkgver, __UNCONST(str)))
break; break;
if (xbps_find_virtual_pkg_in_dict(obj, str, true))
break;
} else { } else {
if (xbps_find_virtual_pkg_in_dict(obj, str, false))
break;
prop_dictionary_get_cstring_nocopy(obj, prop_dictionary_get_cstring_nocopy(obj,
"pkgname", &dpkgn); "pkgname", &dpkgn);
if (strcmp(dpkgn, str) == 0) if (strcmp(dpkgn, str) == 0)
break; break;
if (xbps_find_virtual_pkg_in_dict(obj, str, false))
break;
} }
} }
prop_object_iterator_release(iter); prop_object_iterator_release(iter);