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 AC1A1138334 for ; Thu, 3 Oct 2019 11:50:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3AFAE0844; Thu, 3 Oct 2019 11:50:49 +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 A37FCE0844 for ; Thu, 3 Oct 2019 11:50:49 +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 3577A34B7EB for ; Thu, 3 Oct 2019 11:50:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B185B744 for ; Thu, 3 Oct 2019 11:50:46 +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: <1570103388.3d88c2912ee04e9bb9d2359e3a62ee9f22056447.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: TODO.md qgrep.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 3d88c2912ee04e9bb9d2359e3a62ee9f22056447 X-VCS-Branch: master Date: Thu, 3 Oct 2019 11:50:46 +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: a1cb45ac-6ded-43e5-b1c1-8c6a2b2b7460 X-Archives-Hash: eff56c615bf321e506dbc8519d125995 commit: 3d88c2912ee04e9bb9d2359e3a62ee9f22056447 Author: Fabian Groffen gentoo org> AuthorDate: Thu Oct 3 11:49:48 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Oct 3 11:49:48 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=3d88c291 qgrep: fix matching revisioned ebuilds Bug: https://bugs.gentoo.org/696078 Signed-off-by: Fabian Groffen gentoo.org> TODO.md | 1 + qgrep.c | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/TODO.md b/TODO.md index 299cf17..3db00f7 100644 --- a/TODO.md +++ b/TODO.md @@ -32,6 +32,7 @@ foo-(1234)\_alpha(56789) - these limits should not be an issue for all practical purposes - remove zalloc from atom explode (just initialise what needs to) +- make PVR match PMS https://dev.gentoo.org/~ulm/pms/head/pms.html#x1-10800011 # qmerge diff --git a/qgrep.c b/qgrep.c index 1f6d0de..2a64d1b 100644 --- a/qgrep.c +++ b/qgrep.c @@ -416,14 +416,15 @@ qgrep_cache_cb(tree_pkg_ctx *pkg_ctx, void *priv) } /* cat/pkg/pkg-ver.ebuild */ - snprintf(buf, sizeof(buf), "%s/%s/%s.ebuild", - patom->CATEGORY, patom->PN, patom->P); + snprintf(buf, sizeof(buf), "%s/%s/%s-%s.ebuild", + patom->CATEGORY, patom->PN, patom->PN, + patom->PR_int > 0 ? patom->PVR : patom->PV); label = NULL; if (data->show_name) { if (data->show_repo) patom = tree_get_atom(pkg_ctx, true); - atom_format_r(name, sizeof(name), "%[CATEGORY]%[P]%[REPO]", patom); + atom_format_r(name, sizeof(name), "%[CATEGORY]%[PF]%[REPO]", patom); label = name; } else if (data->show_filename) { label = buf;