From a425c1a91f01dd57f68d25eec3116c9634338d14 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Fri, 29 Mar 2024 11:54:19 +0100 Subject: qmerge: add reminder for myself Signed-off-by: Fabian Groffen --- qmerge.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qmerge.c b/qmerge.c index fba52993..280b0c14 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); -- cgit v1.2.3-65-gdbad