commit: 10bf7790021c157173c4a0294f417eb81aae3842 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Thu Sep 26 13:23:03 2019 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> 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 <grobian <AT> 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) {
