From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5A33B138335 for ; Thu, 2 Jan 2020 14:07:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 19F15E0A65; Thu, 2 Jan 2020 14:07:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D15DAE0A53 for ; Thu, 2 Jan 2020 14:07:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C930C34DE63 for ; Thu, 2 Jan 2020 14:07:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5ECE6AA for ; Thu, 2 Jan 2020 14:07:04 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1577971415.2d78938f5d4c3be536e7484c0f23be64b124db05.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qdepends.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 2d78938f5d4c3be536e7484c0f23be64b124db05 X-VCS-Branch: master Date: Thu, 2 Jan 2020 14:07:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b9156f3d-ea00-42eb-8aa5-1dfdf4b7ea1b X-Archives-Hash: e87088f256d6a4b3815639beda3772a9 commit: 2d78938f5d4c3be536e7484c0f23be64b124db05 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 2 13:23:35 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 2 13:23:35 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=2d78938f qdepends: use tree_foreach_pkg query selection on forward queries Signed-off-by: Fabian Groffen gentoo.org> qdepends.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/qdepends.c b/qdepends.c index 44821b6..6f580a9 100644 --- a/qdepends.c +++ b/qdepends.c @@ -375,14 +375,28 @@ int qdepends_main(int argc, char **argv) array_for_each(overlays, n, overlay) { t = tree_open(portroot, overlay); if (t != NULL) { - ret = tree_foreach_pkg_sorted(t, - qdepends_results_cb, &state, NULL); + if (!(state.qmode & QMODE_REVERSE) && array_cnt(atoms) > 0) { + array_for_each(atoms, i, atom) { + ret = tree_foreach_pkg_sorted(t, + qdepends_results_cb, &state, atom); + } + } else { + ret = tree_foreach_pkg_sorted(t, + qdepends_results_cb, &state, NULL); + } tree_close(t); } } } else { - ret = tree_foreach_pkg_fast(state.vdb, - qdepends_results_cb, &state, NULL); + if (!(state.qmode & QMODE_REVERSE) && array_cnt(atoms) > 0) { + array_for_each(atoms, i, atom) { + ret = tree_foreach_pkg_fast(state.vdb, + qdepends_results_cb, &state, atom); + } + } else { + ret = tree_foreach_pkg_fast(state.vdb, + qdepends_results_cb, &state, NULL); + } } if (state.vdb != NULL)