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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CB1A0158087 for ; Mon, 31 Jan 2022 08:01:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 078832BC017; Mon, 31 Jan 2022 08:01:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6E7E92BC017 for ; Mon, 31 Jan 2022 08:01:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 438573430B5 for ; Mon, 31 Jan 2022 08:01:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B4E56261 for ; Mon, 31 Jan 2022 08:01:46 +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: <1643615960.b5cb53dedf28648f817da28fdcc288894c8e6e45.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qmerge.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: b5cb53dedf28648f817da28fdcc288894c8e6e45 X-VCS-Branch: master Date: Mon, 31 Jan 2022 08:01:46 +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: e8229cb9-07f3-4f06-a8aa-f63e469c4dc6 X-Archives-Hash: 9213b241e50f462da8f04e85a0c5672d commit: b5cb53dedf28648f817da28fdcc288894c8e6e45 Author: Fabian Groffen gentoo org> AuthorDate: Mon Jan 31 07:59:20 2022 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon Jan 31 07:59:20 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=b5cb53de qmerge: just show which packages would be installed without --pretend While pretend shows what would be done, make default mode (interactive) just list what would be installed, not how. Signed-off-by: Fabian Groffen gentoo.org> qmerge.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/qmerge.c b/qmerge.c index 3f82d61..21f0863 100644 --- a/qmerge.c +++ b/qmerge.c @@ -1093,6 +1093,9 @@ pkg_merge(int level, const depend_atom *qatom, const tree_match_ctx *mpkg) freeargv(ARGC, ARGV); } + if (pretend == 100) + return; + /* Get a handle on the main vdb repo */ vdb = tree_open_vdb(portroot, portvdb); if (vdb == NULL) { @@ -1517,9 +1520,6 @@ pkg_unmerge(tree_pkg_ctx *pkg_ctx, depend_atom *rpkg, set *keep, printf("%s***%s unmerging %s\n", YELLOW, NORM, atom_format("%[CATEGORY]%[PF]", tree_get_atom(pkg_ctx, false))); - if (pretend == 100) - return 0; - portroot_fd = cat_ctx->ctx->portroot_fd; /* execute the pkg_prerm step if we're just unmerging, not when @@ -1768,7 +1768,6 @@ pkg_fetch(int level, const depend_atom *qatom, const tree_match_ctx *mpkg) if (pretend) { if (!install) install++; - /* qprint_tree_node(level, qatom, mpkg); */ pkg_merge(level, qatom, mpkg); return; } @@ -2053,7 +2052,7 @@ int qmerge_main(int argc, char **argv) int save_verbose = verbose; int save_quiet = quiet; - pretend = 100; + pretend = save_pretend ? 10 : 100; verbose = 0; quiet = 1; ret = qmerge_run(todo);