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 6F163138334 for ; Tue, 5 Feb 2019 14:20:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7308BE0A07; Tue, 5 Feb 2019 14:20:02 +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 442BEE0A07 for ; Tue, 5 Feb 2019 14:20:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 B2BB9335D61 for ; Tue, 5 Feb 2019 14:20:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 51018520 for ; Tue, 5 Feb 2019 14:19:59 +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: <1549376362.e2319b0dcf7b54d71ddfd1e3eca712c49e83d6fe.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: libq/ X-VCS-Repository: proj/portage-utils X-VCS-Files: libq/atom_explode.c X-VCS-Directories: libq/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: e2319b0dcf7b54d71ddfd1e3eca712c49e83d6fe X-VCS-Branch: master Date: Tue, 5 Feb 2019 14:19:59 +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: fb36ff19-615a-49bd-a88f-34cf1ed8786a X-Archives-Hash: 485573e7bdf47ec50eb9ca4db9929f32 commit: e2319b0dcf7b54d71ddfd1e3eca712c49e83d6fe Author: Fabian Groffen gentoo org> AuthorDate: Tue Feb 5 14:19:22 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Tue Feb 5 14:19:22 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=e2319b0d atom_explode: ignore slot matching operators Bug: https://bugs.gentoo.org/673750 Signed-off-by: Fabian Groffen gentoo.org> libq/atom_explode.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libq/atom_explode.c b/libq/atom_explode.c index a4ba569..de42103 100644 --- a/libq/atom_explode.c +++ b/libq/atom_explode.c @@ -1,9 +1,10 @@ /* - * Copyright 2005-2018 Gentoo Foundation + * Copyright 2005-2019 Gentoo Foundation * Distributed under the terms of the GNU General Public License v2 * * Copyright 2005-2008 Ned Ludd - * Copyright 2005-2014 Mike Frysinger - + * Copyright 2018- Fabian Groffen - */ typedef enum { VER_ALPHA=0, VER_BETA, VER_PRE, VER_RC, VER_NORM, VER_P } atom_suffixes; @@ -161,6 +162,10 @@ atom_explode(const char *atom) if ((ptr = strrchr(ret->CATEGORY, ':')) != NULL) { ret->SLOT = ptr + 1; *ptr = '\0'; + + /* ignore slots that are about package matching */ + if (ret->SLOT[0] == '=' || ret->SLOT[0] == '*') + ret->SLOT = NULL; } /* see if we have any suffix operators */