Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage-utils:master commit in: /
Date: Sun, 06 Feb 2022 15:21:41
Message-Id: 1644160892.65e6273199327ea2f6b12bc66661dd7959758df4.grobian@gentoo
1 commit: 65e6273199327ea2f6b12bc66661dd7959758df4
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Sun Feb 6 15:21:32 2022 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Sun Feb 6 15:21:32 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=65e62731
7
8 qmerge: plug leak in pkg_merge when doing dryrun
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 qmerge.c | 4 +++-
13 1 file changed, 3 insertions(+), 1 deletion(-)
14
15 diff --git a/qmerge.c b/qmerge.c
16 index 4ce14ae..7b738ee 100644
17 --- a/qmerge.c
18 +++ b/qmerge.c
19 @@ -1081,8 +1081,10 @@ pkg_merge(int level, const depend_atom *qatom, const tree_match_ctx *mpkg)
20 freeargv(ARGC, ARGV);
21 }
22
23 - if (pretend == 100)
24 + if (pretend == 100) {
25 + tree_match_close(previnst);
26 return;
27 + }
28
29 /* Get a handle on the main vdb repo */
30 vdb = tree_open_vdb(portroot, portvdb);