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

xbps_sort_pkg_deps: use xbps_check_is_installed_pkg_by_name().

Browse Source
This commit is contained in:
Juan RP 2011-01-27 20:54:23 +01:00
parent 1cc45ee20f
commit 176f5e3e40
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/transaction_sortdeps.c
View File

@ -144,10 +144,7 @@ again:
*/ */
while ((obj2 = prop_object_iterator_next(iter2)) != NULL) { while ((obj2 = prop_object_iterator_next(iter2)) != NULL) {
str = prop_string_cstring_nocopy(obj2); str = prop_string_cstring_nocopy(obj2);
if (str == NULL) { assert(str != NULL);
rv = EINVAL;
goto out;
}
pkgnamedep = xbps_get_pkgpattern_name(str); pkgnamedep = xbps_get_pkgpattern_name(str);
if (pkgnamedep == NULL) { if (pkgnamedep == NULL) {
rv = EINVAL; rv = EINVAL;
@ -158,7 +155,7 @@ again:
* If dependency is already satisfied or queued, * If dependency is already satisfied or queued,
* pass to the next one. * pass to the next one.
*/ */
if (xbps_check_is_installed_pkg_by_pattern(str)) { if (xbps_check_is_installed_pkg_by_name(pkgnamedep)) {
rundepscnt++; rundepscnt++;
xbps_dbg_printf_append("installed.\n"); xbps_dbg_printf_append("installed.\n");
} else if (xbps_find_pkg_in_dict_by_name(transd, } else if (xbps_find_pkg_in_dict_by_name(transd,