diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2019-09-26 15:23:03 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2019-09-26 15:23:03 +0200 |
| commit | 10bf7790021c157173c4a0294f417eb81aae3842 (patch) | |
| tree | db1b32b16935556277f438b33f6d7c7403ff9457 /qlop.c | |
| parent | libq/tree: simplify atom construction in tree_get_atoms_cb (diff) | |
| download | portage-utils-10bf7790021c157173c4a0294f417eb81aae3842.tar.gz portage-utils-10bf7790021c157173c4a0294f417eb81aae3842.tar.bz2 portage-utils-10bf7790021c157173c4a0294f417eb81aae3842.zip | |
qlop: make -v consider revisions as significant too (for -a)
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'qlop.c')
| -rw-r--r-- | qlop.c | 26 |
1 files changed, 18 insertions, 8 deletions
@@ -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) { |