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

lib/package_fulldeptree.c: add items to result if they are found in the hashtable

Browse Source
This commit is contained in:
Duncaen 2019-06-30 22:00:58 +02:00 committed by Juan RP
parent f9233a862c
commit 57256c2328
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/package_fulldeptree.c
View File

@ -113,6 +113,24 @@ addDepn(struct item *item, struct item *xitem)
xitem->dbase = depn; xitem->dbase = depn;
} }
static void
add_deps_recursive(struct item *item)
{
struct depn *dep;
xbps_string_t str;
if (xbps_match_string_in_array(result, item->pkgver))
return;
for (dep = item->dbase; dep; dep = dep->dnext)
add_deps_recursive(dep->item);
str = xbps_string_create_cstring(item->pkgver);
assert(str);
xbps_array_add_first(result, str);
xbps_object_release(str);
}
/* /*
* Recursively calculate all dependencies. * Recursively calculate all dependencies.
*/ */
@ -173,9 +191,11 @@ ordered_depends(struct xbps_handle *xhp, xbps_dictionary_t pkgd, bool rpool)
continue; continue;
} }
xitem = lookupItem(curdepname); xitem = lookupItem(curdepname);
if (xitem == NULL) if (xitem) {
xitem = ordered_depends(xhp, curpkgd, rpool); add_deps_recursive(xitem);
continue;
}
xitem = ordered_depends(xhp, curpkgd, rpool);
if (xitem == NULL) { if (xitem == NULL) {
/* package depends on missing dependencies */ /* package depends on missing dependencies */
xbps_dbg_printf(xhp, "%s: missing dependency '%s'\n", pkgver, curdep); xbps_dbg_printf(xhp, "%s: missing dependency '%s'\n", pkgver, curdep);