| 1 |
commit: 10bf7790021c157173c4a0294f417eb81aae3842 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 26 13:23:03 2019 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 26 13:23:03 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=10bf7790 |
| 7 |
|
| 8 |
qlop: make -v consider revisions as significant too (for -a) |
| 9 |
|
| 10 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 11 |
|
| 12 |
qlop.c | 26 ++++++++++++++++++-------- |
| 13 |
1 file changed, 18 insertions(+), 8 deletions(-) |
| 14 |
|
| 15 |
diff --git a/qlop.c b/qlop.c |
| 16 |
index fcaf973..b75988a 100644 |
| 17 |
--- a/qlop.c |
| 18 |
+++ b/qlop.c |
| 19 |
@@ -613,10 +613,15 @@ static int do_emerge_log( |
| 20 |
if (flags->do_average || flags->do_running) |
| 21 |
{ |
| 22 |
/* find in list of averages */ |
| 23 |
- snprintf(afmt, sizeof(afmt), "%s/%s", |
| 24 |
- pkgw->atom->CATEGORY, |
| 25 |
- (!verbose || flags->do_running) ? |
| 26 |
- pkgw->atom->PN : pkgw->atom->P); |
| 27 |
+ if (!verbose || flags->do_running) { |
| 28 |
+ snprintf(afmt, sizeof(afmt), "%s/%s", |
| 29 |
+ pkgw->atom->CATEGORY, pkgw->atom->PN); |
| 30 |
+ } else { |
| 31 |
+ snprintf(afmt, sizeof(afmt), "%s/%s-%s", |
| 32 |
+ pkgw->atom->CATEGORY, pkgw->atom->PN, |
| 33 |
+ pkgw->atom->PR_int > 0 ? |
| 34 |
+ pkgw->atom->PVR : pkgw->atom->PV); |
| 35 |
+ } |
| 36 |
|
| 37 |
pkg = add_set_value(afmt, pkgw, merge_averages); |
| 38 |
if (pkg != NULL) { |
| 39 |
@@ -752,10 +757,15 @@ static int do_emerge_log( |
| 40 |
if (flags->do_average || flags->do_running) |
| 41 |
{ |
| 42 |
/* find in list of averages */ |
| 43 |
- snprintf(afmt, sizeof(afmt), "%s/%s", |
| 44 |
- pkgw->atom->CATEGORY, |
| 45 |
- (!verbose || flags->do_running) ? |
| 46 |
- pkgw->atom->PN : pkgw->atom->P); |
| 47 |
+ if (!verbose || flags->do_running) { |
| 48 |
+ snprintf(afmt, sizeof(afmt), "%s/%s", |
| 49 |
+ pkgw->atom->CATEGORY, pkgw->atom->PN); |
| 50 |
+ } else { |
| 51 |
+ snprintf(afmt, sizeof(afmt), "%s/%s-%s", |
| 52 |
+ pkgw->atom->CATEGORY, pkgw->atom->PN, |
| 53 |
+ pkgw->atom->PR_int > 0 ? |
| 54 |
+ pkgw->atom->PVR : pkgw->atom->PV); |
| 55 |
+ } |
| 56 |
|
| 57 |
pkg = add_set_value(afmt, pkgw, unmerge_averages); |
| 58 |
if (pkg != NULL) { |
Archives