| 1 |
commit: 70e1dcf3fb72456518484103d5148c59d3c0f27a |
| 2 |
Author: Joakim Tjernlund <joakim.tjernlund <AT> infinera <DOT> com> |
| 3 |
AuthorDate: Wed Jun 16 14:43:12 2021 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 16 19:19:44 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=70e1dcf3 |
| 7 |
|
| 8 |
qmerge: do not run pkg_pretend/pkg_setup/pkg_preinst if pretend |
| 9 |
|
| 10 |
Signed-off-by: Joakim Tjernlund <joakim.tjernlund <AT> infinera.com> |
| 11 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 12 |
|
| 13 |
qmerge.c | 8 +++++--- |
| 14 |
1 file changed, 5 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/qmerge.c b/qmerge.c |
| 17 |
index ac7ce6d..583a27e 100644 |
| 18 |
--- a/qmerge.c |
| 19 |
+++ b/qmerge.c |
| 20 |
@@ -1288,9 +1288,11 @@ pkg_merge(int level, const depend_atom *qatom, const tree_match_ctx *mpkg) |
| 21 |
fflush(stdout); |
| 22 |
|
| 23 |
eat_file("vdb/DEFINED_PHASES", &pm_phases, &pm_phases_len); |
| 24 |
- pkg_run_func("vdb", pm_phases, "pkg_pretend", D, T); |
| 25 |
- pkg_run_func("vdb", pm_phases, "pkg_setup", D, T); |
| 26 |
- pkg_run_func("vdb", pm_phases, "pkg_preinst", D, T); |
| 27 |
+ if (!pretend) { |
| 28 |
+ pkg_run_func("vdb", pm_phases, "pkg_pretend", D, T); |
| 29 |
+ pkg_run_func("vdb", pm_phases, "pkg_setup", D, T); |
| 30 |
+ pkg_run_func("vdb", pm_phases, "pkg_preinst", D, T); |
| 31 |
+ } |
| 32 |
|
| 33 |
if (!eat_file("vdb/EPREFIX", &eprefix, &eprefix_len)) |
| 34 |
eprefix_len = 0; |
Archives