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 B15DC158041 for ; Fri, 29 Mar 2024 10:57:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 05DF3E2A30; Fri, 29 Mar 2024 10:57:24 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DD629E2A30 for ; Fri, 29 Mar 2024 10:57:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 00258342FF9 for ; Fri, 29 Mar 2024 10:57:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 921741602 for ; Fri, 29 Mar 2024 10:57:21 +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: <1711709667.a425c1a91f01dd57f68d25eec3116c9634338d14.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: a425c1a91f01dd57f68d25eec3116c9634338d14 X-VCS-Branch: master Date: Fri, 29 Mar 2024 10:57:21 +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: 84efa3e7-b81c-43f7-bf96-9df9911b00d9 X-Archives-Hash: 1f7a712e14818ac7364737dd6b183c9e commit: a425c1a91f01dd57f68d25eec3116c9634338d14 Author: Fabian Groffen gentoo org> AuthorDate: Fri Mar 29 10:54:19 2024 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Fri Mar 29 10:54:27 2024 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=a425c1a9 qmerge: add reminder for myself Signed-off-by: Fabian Groffen gentoo.org> qmerge.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qmerge.c b/qmerge.c index fba5299..280b0c1 100644 --- a/qmerge.c +++ b/qmerge.c @@ -1481,6 +1481,10 @@ pkg_merge(int level, const depend_atom *qatom, const tree_match_ctx *mpkg) cpath = xstrdup(""); /* xrealloced in merge_tree_at */ + /* TODO: use replacing to pass over pervinst->pkg for + * VDB/CONTENTS and respect the config-protect-if-modified flag + * like unmerge does */ + ret = merge_tree_at(AT_FDCWD, "image", AT_FDCWD, portroot, contents, eprefix_len, &objs, &cpath, cp_argc, cp_argv, cpm_argc, cpm_argv);