diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2018-03-31 20:28:17 +0200 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2018-03-31 20:28:17 +0200 |
| commit | d5ad743480ae05fcfb6e92d29007402a7d7554ef (patch) | |
| tree | 2c00d9ea7a5cca52a13786538315c414aa795032 | |
| parent | qlop: document and format to fit on 80 chars, some style (diff) | |
| download | portage-utils-d5ad743480ae05fcfb6e92d29007402a7d7554ef.tar.gz portage-utils-d5ad743480ae05fcfb6e92d29007402a7d7554ef.tar.bz2 portage-utils-d5ad743480ae05fcfb6e92d29007402a7d7554ef.zip | |
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
| -rw-r--r-- | qlop.c | 1 | ||||
| -rwxr-xr-x | tests/qlop/dotest | 3 |
2 files changed, 4 insertions, 0 deletions
@@ -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 ea4052db..ac309242 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 |