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: libq/
Date: Thu, 26 May 2022 14:36:41
Message-Id: 1653557428.84804b1dfcf6e5f3b7a7cca2212c8b2d5a7e4f4b.grobian@gentoo
1 commit: 84804b1dfcf6e5f3b7a7cca2212c8b2d5a7e4f4b
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 26 09:30:28 2022 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Thu May 26 09:30:28 2022 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=84804b1d
7
8 libq/dep: allow resolving multiple times (e.g. for overlays)
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 libq/dep.c | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15 diff --git a/libq/dep.c b/libq/dep.c
16 index 4138a1c..389e506 100644
17 --- a/libq/dep.c
18 +++ b/libq/dep.c
19 @@ -355,7 +355,7 @@ void
20 dep_resolve_tree(dep_node *root, tree_ctx *t)
21 {
22 if (root->type != DEP_NULL) {
23 - if (root->type == DEP_NORM && root->atom) {
24 + if (root->type == DEP_NORM && root->atom && !root->atom_resolved) {
25 depend_atom *d = root->atom;
26 tree_match_ctx *r = tree_match_atom(t, d,
27 TREE_MATCH_DEFAULT |