From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1167010-garchives=archives.gentoo.org@lists.gentoo.org>
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 AE9AA138350
for <garchives@archives.gentoo.org>; Sat, 2 May 2020 08:45:57 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id F1FDDE088F;
Sat, 2 May 2020 08:45:56 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 BE81CE088F
for <gentoo-commits@lists.gentoo.org>; Sat, 2 May 2020 08:45:56 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(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 47CCA34F0FF
for <gentoo-commits@lists.gentoo.org>; Sat, 2 May 2020 08:45:55 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id A074F1F9
for <gentoo-commits@lists.gentoo.org>; Sat, 2 May 2020 08:45:53 +0000 (UTC)
From: "Fabian Groffen" <grobian@gentoo.org>
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" <grobian@gentoo.org>
Message-ID: <1588409142.3080e828810d81a292c97226b115f390f487f370.grobian@gentoo>
Subject: [gentoo-commits] proj/portage-utils:master commit in: /
X-VCS-Repository: proj/portage-utils
X-VCS-Files: qlop.c
X-VCS-Directories: /
X-VCS-Committer: grobian
X-VCS-Committer-Name: Fabian Groffen
X-VCS-Revision: 3080e828810d81a292c97226b115f390f487f370
X-VCS-Branch: master
Date: Sat, 2 May 2020 08:45:53 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a95cb0ca-4a50-4f6f-9e3a-7a1b101a1fb6
X-Archives-Hash: 1cb9036392379647b9cff8b97fc95751
commit: 3080e828810d81a292c97226b115f390f487f370
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat May 2 08:43:23 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat May 2 08:45:42 2020 +0000
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=3080e828
qlop: show unmerged packages also in pseudo emerge format with -E
Packages unmerged (e.g. emerge -c) or unmerged in a blocker situation
showed up in -E mode in the normal way, e.g.:
2020-04-30T20:03:51 <<< www-servers/nginx-1.17.10
Make it show like in pseudo emerge output:
D www-servers/nginx-1.17.10
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
qlop.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/qlop.c b/qlop.c
index 3e38adf..69133bb 100644
--- a/qlop.c
+++ b/qlop.c
@@ -825,6 +825,22 @@ static int do_emerge_log(
flags->do_time ? ": " : "",
flags->do_time ?
fmt_elapsedtime(flags, elapsed) : "");
+ } else if (flags->show_emerge) {
+ /* emerge never lists packages it unmerges, only
+ * when part of installation of another package,
+ * so there is nothing to follow here. We could
+ * use D(elete), R(emove) or (U)nmerge here,
+ * which all three are already in use. I've
+ * chosen to use D in the first column here,
+ * because D is only used together with U, so it
+ * is the only distinquishable choice, appearing
+ * in the place of N(ew). */
+ printf("%sD%s %s", RED, NORM,
+ atom_format(flags->fmt, pkgw->atom));
+ if (flags->do_time)
+ printf(": %s\n", fmt_elapsedtime(flags, elapsed));
+ else
+ printf("\n");
} else if (flags->do_time) {
printf("%s <<< %s: %s\n",
fmt_date(flags, pkgw->tbegin, tstart),