From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 541981382C5 for ; Sat, 31 Mar 2018 18:31:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E913E09C1; Sat, 31 Mar 2018 18:31:05 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4BC4CE09C1 for ; Sat, 31 Mar 2018 18:31:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3D3AA335CE6 for ; Sat, 31 Mar 2018 18:31:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C82CE26F for ; Sat, 31 Mar 2018 18:31:02 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1522520897.d5ad743480ae05fcfb6e92d29007402a7d7554ef.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: /, tests/qlop/ X-VCS-Repository: proj/portage-utils X-VCS-Files: qlop.c tests/qlop/dotest X-VCS-Directories: / tests/qlop/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: d5ad743480ae05fcfb6e92d29007402a7d7554ef X-VCS-Branch: master Date: Sat, 31 Mar 2018 18:31:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 086968f4-e449-4edf-b99f-f1be051c2045 X-Archives-Hash: 1dcc861dc88d6493e88378a829061d07 commit: d5ad743480ae05fcfb6e92d29007402a7d7554ef Author: Fabian Groffen gentoo org> AuthorDate: Sat Mar 31 18:28:17 2018 +0000 Commit: Fabian Groffen gentoo 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