[gentoo-commits] proj/portage-utils:master commit in: /

[Fabian Groffen]

commit:     b5cb53dedf28648f817da28fdcc288894c8e6e45
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 31 07:59:20 2022 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> 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 <grobian <AT> 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);