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: Wed, 29 Dec 2021 12:20:10
Message-Id: 1640780356.28489559193b543926ce93b95eb5f6f91b5a5574.grobian@gentoo
1 commit: 28489559193b543926ce93b95eb5f6f91b5a5574
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 29 12:19:16 2021 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 29 12:19:16 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=28489559
7
8 qmerge: drop ugly tree_pkg_meta_get workaround
9
10 tree_pkg_meta_get() returned pointers now won't change for as long as
11 the object exists
12
13 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
14
15 qmerge.c | 1 -
16 1 file changed, 1 deletion(-)
17
18 diff --git a/qmerge.c b/qmerge.c
19 index 75f03c0..3f82d61 100644
20 --- a/qmerge.c
21 +++ b/qmerge.c
22 @@ -1528,7 +1528,6 @@ pkg_unmerge(tree_pkg_ctx *pkg_ctx, depend_atom *rpkg, set *keep,
23 if (!pretend && rpkg == NULL) {
24 buf = tree_pkg_meta_get(pkg_ctx, EAPI);
25 phases = tree_pkg_meta_get(pkg_ctx, DEFINED_PHASES);
26 - buf = tree_pkg_meta_get(pkg_ctx, EAPI); /* when phases caused ralloc */
27 if (phases != NULL) {
28 mkdirat(pkg_ctx->fd, "temp", 0755);
29 pkg_run_func_at(pkg_ctx->fd, ".", phases, PKG_PRERM,