| 1 |
commit: 3080e828810d81a292c97226b115f390f487f370 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat May 2 08:43:23 2020 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 2 08:45:42 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=3080e828 |
| 7 |
|
| 8 |
qlop: show unmerged packages also in pseudo emerge format with -E |
| 9 |
|
| 10 |
Packages unmerged (e.g. emerge -c) or unmerged in a blocker situation |
| 11 |
showed up in -E mode in the normal way, e.g.: |
| 12 |
|
| 13 |
2020-04-30T20:03:51 <<< www-servers/nginx-1.17.10 |
| 14 |
|
| 15 |
Make it show like in pseudo emerge output: |
| 16 |
|
| 17 |
D www-servers/nginx-1.17.10 |
| 18 |
|
| 19 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 20 |
|
| 21 |
qlop.c | 16 ++++++++++++++++ |
| 22 |
1 file changed, 16 insertions(+) |
| 23 |
|
| 24 |
diff --git a/qlop.c b/qlop.c |
| 25 |
index 3e38adf..69133bb 100644 |
| 26 |
--- a/qlop.c |
| 27 |
+++ b/qlop.c |
| 28 |
@@ -825,6 +825,22 @@ static int do_emerge_log( |
| 29 |
flags->do_time ? ": " : "", |
| 30 |
flags->do_time ? |
| 31 |
fmt_elapsedtime(flags, elapsed) : ""); |
| 32 |
+ } else if (flags->show_emerge) { |
| 33 |
+ /* emerge never lists packages it unmerges, only |
| 34 |
+ * when part of installation of another package, |
| 35 |
+ * so there is nothing to follow here. We could |
| 36 |
+ * use D(elete), R(emove) or (U)nmerge here, |
| 37 |
+ * which all three are already in use. I've |
| 38 |
+ * chosen to use D in the first column here, |
| 39 |
+ * because D is only used together with U, so it |
| 40 |
+ * is the only distinquishable choice, appearing |
| 41 |
+ * in the place of N(ew). */ |
| 42 |
+ printf("%sD%s %s", RED, NORM, |
| 43 |
+ atom_format(flags->fmt, pkgw->atom)); |
| 44 |
+ if (flags->do_time) |
| 45 |
+ printf(": %s\n", fmt_elapsedtime(flags, elapsed)); |
| 46 |
+ else |
| 47 |
+ printf("\n"); |
| 48 |
} else if (flags->do_time) { |
| 49 |
printf("%s <<< %s: %s\n", |
| 50 |
fmt_date(flags, pkgw->tbegin, tstart), |
Archives