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

lib/package_fulldeptree.c: don't add the package itself to the fulldeptree result

Browse Source 
This was noticed a few days ago by @leah2.
This commit is contained in:
Duncaen
2019-06-30 22:01:37 +02:00
committed by Juan RP
parent 57256c2328
commit 7c3029589c
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/package_fulldeptree.c
View File

@ -135,7 +135,8 @@ add_deps_recursive(struct item *item)
* Recursively calculate all dependencies. * Recursively calculate all dependencies.
*/ */
static struct item * static struct item *
ordered_depends(struct xbps_handle *xhp, xbps_dictionary_t pkgd, bool rpool) ordered_depends(struct xbps_handle *xhp, xbps_dictionary_t pkgd, bool rpool,
size_t depth)
{ {
xbps_array_t rdeps, provides; xbps_array_t rdeps, provides;
xbps_string_t str; xbps_string_t str;
@ -195,7 +196,7 @@ ordered_depends(struct xbps_handle *xhp, xbps_dictionary_t pkgd, bool rpool)
add_deps_recursive(xitem); add_deps_recursive(xitem);
continue; continue;
} }
xitem = ordered_depends(xhp, curpkgd, rpool); xitem = ordered_depends(xhp, curpkgd, rpool, depth+1);
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);
@ -207,7 +208,7 @@ ordered_depends(struct xbps_handle *xhp, xbps_dictionary_t pkgd, bool rpool)
free(curdepname); free(curdepname);
} }
/* all deps were processed, add item to head */ /* all deps were processed, add item to head */
if (!xbps_match_string_in_array(result, item->pkgver)) { if (depth > 0 && !xbps_match_string_in_array(result, item->pkgver)) {
str = xbps_string_create_cstring(item->pkgver); str = xbps_string_create_cstring(item->pkgver);
assert(str); assert(str);
xbps_array_add_first(result, str); xbps_array_add_first(result, str);
@ -233,7 +234,7 @@ xbps_get_pkg_fulldeptree(struct xbps_handle *xhp, const char *pkg, bool rpool)
((pkgd = xbps_pkgdb_get_virtualpkg(xhp, pkg)) == NULL)) ((pkgd = xbps_pkgdb_get_virtualpkg(xhp, pkg)) == NULL))
return NULL; return NULL;
} }
if (ordered_depends(xhp, pkgd, rpool) == NULL) if (ordered_depends(xhp, pkgd, rpool, 0) == NULL)
return NULL; return NULL;
return result; return result;

4
tests/xbps/libxbps/shell/incorrect_deps_test.sh
View File

@ -93,8 +93,8 @@ incorrect_dep_dups_body() {
out=$(xbps-query -C empty.conf -r root --fulldeptree -x B) out=$(xbps-query -C empty.conf -r root --fulldeptree -x B)
set -- $out set -- $out
atf_check_equal $# 2 atf_check_equal $# 1
atf_check_equal "$1 $2" "B-1.0_1 A-1.0_1" atf_check_equal "$1" "A-1.0_1"
} }
atf_test_case missing_deps atf_test_case missing_deps