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

[Fabian Groffen]

commit:     70e1dcf3fb72456518484103d5148c59d3c0f27a
Author:     Joakim Tjernlund <joakim.tjernlund <AT> infinera <DOT> com>
AuthorDate: Wed Jun 16 14:43:12 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Jun 16 19:19:44 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=70e1dcf3

qmerge: do not run pkg_pretend/pkg_setup/pkg_preinst if pretend

Signed-off-by: Joakim Tjernlund <joakim.tjernlund <AT> infinera.com>
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 qmerge.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/qmerge.c b/qmerge.c
index ac7ce6d..583a27e 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -1288,9 +1288,11 @@ pkg_merge(int level, const depend_atom *qatom, const 
tree_match_ctx *mpkg)
        fflush(stdout);
 
        eat_file("vdb/DEFINED_PHASES", &pm_phases, &pm_phases_len);
-       pkg_run_func("vdb", pm_phases, "pkg_pretend", D, T);
-       pkg_run_func("vdb", pm_phases, "pkg_setup", D, T);
-       pkg_run_func("vdb", pm_phases, "pkg_preinst", D, T);
+       if (!pretend) {
+               pkg_run_func("vdb", pm_phases, "pkg_pretend", D, T);
+               pkg_run_func("vdb", pm_phases, "pkg_setup", D, T);
+               pkg_run_func("vdb", pm_phases, "pkg_preinst", D, T);
+       }
 
        if (!eat_file("vdb/EPREFIX", &eprefix, &eprefix_len))
                eprefix_len = 0;