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 DD52B138334 for ; Thu, 26 Sep 2019 14:06:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25ED9E079E; Thu, 26 Sep 2019 14:06:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 0B8A4E079E for ; Thu, 26 Sep 2019 14:06:51 +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 E462C34B5D3 for ; Thu, 26 Sep 2019 14:06:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A6777F2 for ; Thu, 26 Sep 2019 14:06:47 +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: <1569504183.10bf7790021c157173c4a0294f417eb81aae3842.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qlop.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 10bf7790021c157173c4a0294f417eb81aae3842 X-VCS-Branch: master Date: Thu, 26 Sep 2019 14:06:47 +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: 64c0b784-c2a3-4ce9-a809-b644b6369a5e X-Archives-Hash: c6259c195a9578ae539568acc2641b56 commit: 10bf7790021c157173c4a0294f417eb81aae3842 Author: Fabian Groffen gentoo org> AuthorDate: Thu Sep 26 13:23:03 2019 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Sep 26 13:23:03 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=10bf7790 qlop: make -v consider revisions as significant too (for -a) Signed-off-by: Fabian Groffen gentoo.org> qlop.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/qlop.c b/qlop.c index fcaf973..b75988a 100644 --- a/qlop.c +++ b/qlop.c @@ -613,10 +613,15 @@ static int do_emerge_log( if (flags->do_average || flags->do_running) { /* find in list of averages */ - snprintf(afmt, sizeof(afmt), "%s/%s", - pkgw->atom->CATEGORY, - (!verbose || flags->do_running) ? - pkgw->atom->PN : pkgw->atom->P); + if (!verbose || flags->do_running) { + snprintf(afmt, sizeof(afmt), "%s/%s", + pkgw->atom->CATEGORY, pkgw->atom->PN); + } else { + snprintf(afmt, sizeof(afmt), "%s/%s-%s", + pkgw->atom->CATEGORY, pkgw->atom->PN, + pkgw->atom->PR_int > 0 ? + pkgw->atom->PVR : pkgw->atom->PV); + } pkg = add_set_value(afmt, pkgw, merge_averages); if (pkg != NULL) { @@ -752,10 +757,15 @@ static int do_emerge_log( if (flags->do_average || flags->do_running) { /* find in list of averages */ - snprintf(afmt, sizeof(afmt), "%s/%s", - pkgw->atom->CATEGORY, - (!verbose || flags->do_running) ? - pkgw->atom->PN : pkgw->atom->P); + if (!verbose || flags->do_running) { + snprintf(afmt, sizeof(afmt), "%s/%s", + pkgw->atom->CATEGORY, pkgw->atom->PN); + } else { + snprintf(afmt, sizeof(afmt), "%s/%s-%s", + pkgw->atom->CATEGORY, pkgw->atom->PN, + pkgw->atom->PR_int > 0 ? + pkgw->atom->PVR : pkgw->atom->PV); + } pkg = add_set_value(afmt, pkgw, unmerge_averages); if (pkg != NULL) {