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 CFA871382C5 for ; Wed, 16 Jun 2021 19:21:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EAF50E0825; Wed, 16 Jun 2021 19:21:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 D1785E0825 for ; Wed, 16 Jun 2021 19:21:53 +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 98404335D92 for ; Wed, 16 Jun 2021 19:21:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 38DB37B0 for ; Wed, 16 Jun 2021 19:21:51 +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: <1623871184.70e1dcf3fb72456518484103d5148c59d3c0f27a.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: 70e1dcf3fb72456518484103d5148c59d3c0f27a X-VCS-Branch: master Date: Wed, 16 Jun 2021 19:21:51 +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: c9d475b0-4b9f-4d72-97a1-274080de81d6 X-Archives-Hash: a6731067b2d8a02aef4671410730dd5a commit: 70e1dcf3fb72456518484103d5148c59d3c0f27a Author: Joakim Tjernlund infinera com> AuthorDate: Wed Jun 16 14:43:12 2021 +0000 Commit: Fabian Groffen gentoo 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 infinera.com> Signed-off-by: Fabian Groffen 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;