From fccf3d79f01ecd47b9f927cbd11f26ede56b8303 Mon Sep 17 00:00:00 2001 From: Duncan Overbruck Date: Fri, 19 Mar 2021 13:54:23 +0100 Subject: [PATCH] lib/transaction_pkg_deps.c: skipping queued removed or held dependencies makes no sense --- lib/transaction_pkg_deps.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/transaction_pkg_deps.c b/lib/transaction_pkg_deps.c index a77d2ac1..e23966ed 100644 --- a/lib/transaction_pkg_deps.c +++ b/lib/transaction_pkg_deps.c @@ -186,9 +186,12 @@ repo_deps(struct xbps_handle *xhp, */ if ((curpkgd = xbps_find_pkg_in_array(pkgs, reqpkg, 0)) || (curpkgd = xbps_find_virtualpkg_in_array(xhp, pkgs, reqpkg, 0))) { + xbps_trans_type_t ttype_q = xbps_transaction_pkg_type(curpkgd); xbps_dictionary_get_cstring_nocopy(curpkgd, "pkgver", &pkgver_q); - xbps_dbg_printf_append(xhp, " (%s queued)\n", pkgver_q); - continue; + if (ttype_q != XBPS_TRANS_REMOVE && ttype_q != XBPS_TRANS_HOLD) { + xbps_dbg_printf_append(xhp, " (%s queued %d)\n", pkgver_q, ttype_q); + continue; + } } /* * Pass 3: check if required dependency is already installed