diff options
| author |   Jaak Ristioja <jaak@ristioja.ee> | 2022-02-11 17:31:05 +0200 |
|---|---|---|
| committer |   Fabian Groffen <grobian@gentoo.org> | 2022-02-12 17:14:11 +0100 |
| commit | fc71a04651ab56b0133c61d839169a0cabf6f092 (patch) | |
| tree | 85453643a872055bc87667820ed2b582f86e74ce | |
| parent | README: use github badge for build status (diff) | |
| download | portage-utils-fc71a04651ab56b0133c61d839169a0cabf6f092.tar.gz portage-utils-fc71a04651ab56b0133c61d839169a0cabf6f092.tar.bz2 portage-utils-fc71a04651ab56b0133c61d839169a0cabf6f092.zip | |
qlop: Fixed --running --verbose returning unknown ETA
It seems that this was broken during the introduction of --predict in commit
13402fbd8c51f7feedcc85f2f0815768ec45ee7a which caused keys of the merge_averages
and unmerge_averages sets to include version information, whereas --running
expects these not to include version information.
Bug: https://bugs.gentoo.org/807975
Signed-off-by: Jaak Ristioja <jaak@ristioja.ee>
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
| -rw-r--r-- | qlop.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -797,7 +797,9 @@ static int do_emerge_log( || flags->do_running) { /* find in list of averages */ - if (flags->do_predict || verbose) { + if (flags->do_predict || + (verbose && !flags->do_running)) + { snprintf(afmt, sizeof(afmt), "%s/%s", pkgw->atom->CATEGORY, pkgw->atom->PF); } else { @@ -940,7 +942,9 @@ static int do_emerge_log( || flags->do_running) { /* find in list of averages */ - if (flags->do_predict || verbose) { + if (flags->do_predict || + (verbose && !flags->do_running)) + { snprintf(afmt, sizeof(afmt), "%s/%s", pkgw->atom->CATEGORY, pkgw->atom->PF); } else { |