From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BDB5313835B for ; Wed, 16 Jun 2021 19:21:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DB35DE0824; Wed, 16 Jun 2021 19:21:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C2CB2E0824 for ; Wed, 16 Jun 2021 19:21:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 95F83335D85 for ; Wed, 16 Jun 2021 19:21:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 11F387AE for ; Wed, 16 Jun 2021 19:21:51 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1623871183.137025a3bb18195b6e2dd57a4ec52af6db352a51.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qmerge.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 137025a3bb18195b6e2dd57a4ec52af6db352a51 X-VCS-Branch: master Date: Wed, 16 Jun 2021 19:21:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 95488c2d-6417-4445-ba19-ad0265104077 X-Archives-Hash: 1e99e2e45547e1b830bac594557db351 commit: 137025a3bb18195b6e2dd57a4ec52af6db352a51 Author: Joakim Tjernlund infinera com> AuthorDate: Wed Jun 16 14:43:13 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Wed Jun 16 19:19:43 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=137025a3 qmerge: fix type for NULL SLOTs Use SLOT="0" if no SLOT exists, not the other way around Signed-off-by: Joakim Tjernlund infinera.com> Signed-off-by: Fabian Groffen gentoo.org> qmerge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmerge.c b/qmerge.c index 0e7ada4..3b74426 100644 --- a/qmerge.c +++ b/qmerge.c @@ -1015,7 +1015,7 @@ pkg_merge(int level, const depend_atom *qatom, const tree_match_ctx *mpkg) snprintf(buf, sizeof(buf), "%s/%s:%s", mpkg->atom->CATEGORY, mpkg->atom->PN, - mpkg->atom->SLOT != NULL ? "0" : mpkg->atom->SLOT); + mpkg->atom->SLOT == NULL ? "0" : mpkg->atom->SLOT); slotatom = atom_explode(buf); previnst = best_version(slotatom, BV_INSTALLED);