commit: d5ad743480ae05fcfb6e92d29007402a7d7554ef Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Sat Mar 31 18:28:17 2018 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Sat Mar 31 18:28:17 2018 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=d5ad7434
qlop: fix false detection of end for aborted merge, bug #470168 When a merge gets aborted, ensure we forget about it if we find about that same package later in another merge run. Bug: https://bugs.gentoo.org/470168 qlop.c | 1 + tests/qlop/dotest | 3 +++ 2 files changed, 4 insertions(+) diff --git a/qlop.c b/qlop.c index c7ad42f..464a488 100644 --- a/qlop.c +++ b/qlop.c @@ -200,6 +200,7 @@ show_merge_times(char *package, const char *logfile, int average, char human_rea parallel_emerge--; /* update the main emerge reference data */ snprintf(ep, BUFSIZ, "completed %s", &buf[1][4]); + t[0] = t[1]; continue; } } diff --git a/tests/qlop/dotest b/tests/qlop/dotest index ea4052d..ac30924 100755 --- a/tests/qlop/dotest +++ b/tests/qlop/dotest @@ -43,6 +43,9 @@ test 06 0 "qlop -l -f ${as}/sync.log -d 2005-01-01" test 07 0 "qlop -l -f ${as}/sync.log -d '%d %Y %m|01 2005 01'" test 08 0 "qlop -l -f ${as}/sync.log -d 1104898893" +# deal with aborted merges +test 09 0 "qlop -Htgv automake -f ${as}/aborts.log" + cleantmpdir end
