| 1 |
commit: 137025a3bb18195b6e2dd57a4ec52af6db352a51 |
| 2 |
Author: Joakim Tjernlund <joakim.tjernlund <AT> infinera <DOT> com> |
| 3 |
AuthorDate: Wed Jun 16 14:43:13 2021 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 16 19:19:43 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=137025a3 |
| 7 |
|
| 8 |
qmerge: fix type for NULL SLOTs |
| 9 |
|
| 10 |
Use SLOT="0" if no SLOT exists, not the other way around |
| 11 |
|
| 12 |
Signed-off-by: Joakim Tjernlund <joakim.tjernlund <AT> infinera.com> |
| 13 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 14 |
|
| 15 |
qmerge.c | 2 +- |
| 16 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/qmerge.c b/qmerge.c |
| 19 |
index 0e7ada4..3b74426 100644 |
| 20 |
--- a/qmerge.c |
| 21 |
+++ b/qmerge.c |
| 22 |
@@ -1015,7 +1015,7 @@ pkg_merge(int level, const depend_atom *qatom, const tree_match_ctx *mpkg) |
| 23 |
snprintf(buf, sizeof(buf), "%s/%s:%s", |
| 24 |
mpkg->atom->CATEGORY, |
| 25 |
mpkg->atom->PN, |
| 26 |
- mpkg->atom->SLOT != NULL ? "0" : mpkg->atom->SLOT); |
| 27 |
+ mpkg->atom->SLOT == NULL ? "0" : mpkg->atom->SLOT); |
| 28 |
slotatom = atom_explode(buf); |
| 29 |
|
| 30 |
previnst = best_version(slotatom, BV_INSTALLED); |
Archives