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, 30 Jun 2021 06:26:59
Message-Id: 1625034381.9b169ce0e900cae2ff3112d697d439a3084335e4.grobian@gentoo
1 commit: 9b169ce0e900cae2ff3112d697d439a3084335e4
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 30 06:26:21 2021 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 30 06:26:21 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=9b169ce0
7
8 qmerge: allow installing virtual/* and acct-*/*
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 qmerge.c | 6 ++++--
13 1 file changed, 4 insertions(+), 2 deletions(-)
14
15 diff --git a/qmerge.c b/qmerge.c
16 index d6532eb..2323f78 100644
17 --- a/qmerge.c
18 +++ b/qmerge.c
19 @@ -239,7 +239,8 @@ best_version(const depend_atom *atom, int mode)
20 _qmerge_vdb_tree = vdb;
21 }
22 tmv = tree_match_atom(vdb, atom,
23 - TREE_MATCH_LATEST | TREE_MATCH_FIRST);
24 + TREE_MATCH_LATEST | TREE_MATCH_FIRST |
25 + TREE_MATCH_VIRTUAL | TREE_MATCH_ACCT);
26 }
27
28 if (mode & BV_BINPKG) {
29 @@ -255,7 +256,8 @@ best_version(const depend_atom *atom, int mode)
30 _qmerge_binpkg_tree = binpkg;
31 }
32 tmp = tree_match_atom(binpkg, atom,
33 - TREE_MATCH_LATEST | TREE_MATCH_FIRST | TREE_MATCH_METADATA);
34 + TREE_MATCH_LATEST | TREE_MATCH_FIRST | TREE_MATCH_METADATA |
35 + TREE_MATCH_VIRTUAL | TREE_MATCH_ACCT);
36 }
37
38 if (tmv == NULL && tmp == NULL)