aboutsummaryrefslogtreecommitdiff
path: root/qlop.c
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2019-10-20 11:07:31 +0200
committerFabian Groffen <grobian@gentoo.org>2019-10-20 11:07:31 +0200
commite526bb8f26e2065bf990a0783ef3b1a9ad1fdb3d (patch)
tree0e167c9fcafe7bb232a17b2417bba7617c4aaa90 /qlop.c
parentqfile: fix matching of full paths, bug #697094 (diff)
downloadportage-utils-e526bb8f26e2065bf990a0783ef3b1a9ad1fdb3d.tar.gz
portage-utils-e526bb8f26e2065bf990a0783ef3b1a9ad1fdb3d.tar.bz2
portage-utils-e526bb8f26e2065bf990a0783ef3b1a9ad1fdb3d.zip
qlop: don't "forget" merges when a parallel merge finishes
Stop seeing finishing emerge processes double, thereby wrongly calculating the current parallel merges. Bug: https://bugs.gentoo.org/697068 Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Diffstat (limited to 'qlop.c')
-rw-r--r--qlop.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/qlop.c b/qlop.c
index 43476991..7a936564 100644
--- a/qlop.c
+++ b/qlop.c
@@ -474,8 +474,7 @@ static int do_emerge_log(
* finished without knowledge of another instance */
if (flags->do_running &&
(strncmp(p, " *** emerge ", 13) == 0 ||
- strncmp(p, " *** terminating.", 18) == 0 ||
- strncmp(p, " *** exiting ", 14) == 0))
+ strncmp(p, " *** terminating.", 18) == 0))
{
if (p[7] == 'm') {
parallel_emerge++;